OpenE2K/glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update.

Browse Source 
* Makeconfig: Ensures the soversions.mk part of Makefile gets
	included before building gnu/lib-names.h
	Patch by Maciej W. Rozycki <macro@ds2.pg.gda.pl>.
This commit is contained in:
Ulrich Drepper 2000-08-25 18:07:41 +00:00
parent 7045878b04
commit 1bc777b883
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2000-08-25 Ulrich Drepper <drepper@redhat.com> 2000-08-25 Ulrich Drepper <drepper@redhat.com>
* Makeconfig: Ensures the soversions.mk part of Makefile gets
included before building gnu/lib-names.h
Patch by Maciej W. Rozycki <macro@ds2.pg.gda.pl>.
* elf/dl-close.c (_dl_close): Don't run destructors of objects * elf/dl-close.c (_dl_close): Don't run destructors of objects
marked DF_1_NODELETE. marked DF_1_NODELETE.

19
Makeconfig
View File

@ -725,14 +725,15 @@ $(common-objpfx)soversions.i: $(..)shlib-versions $(..)Makeconfig \
done > $@T; exit 0 done > $@T; exit 0
mv -f $@T $@ mv -f $@T $@
$(common-objpfx)soversions.mk: $(common-objpfx)soversions.i $(common-objpfx)soversions.mk: $(common-objpfx)soversions.i
while read lib number setname; do \ (while read lib number setname; do \
case $$number in \ case $$number in \
[0-9]*) echo "$$lib.so-version=.$$number"; \ [0-9]*) echo "$$lib.so-version=.$$number"; \
echo "all-sonames+=$$lib=$$lib.so\$$($$lib.so-version)";;\ echo "all-sonames+=$$lib=$$lib.so\$$($$lib.so-version)";;\
*) echo "$$lib.so-version=$$number"; \ *) echo "$$lib.so-version=$$number"; \
echo "all-sonames+=$$lib=\$$($$lib.so-version)";;\ echo "all-sonames+=$$lib=\$$($$lib.so-version)";;\
esac; \ esac; \
done < $< > $@T; exit 0 done; \
echo soversions.mk-done = t;) < $< > $@T; exit 0
mv -f $@T $@ mv -f $@T $@
endif endif
endif endif
@ -742,6 +743,7 @@ postclean-generated += soversions.mk
# Generate the header containing the names of all shared libraries. # Generate the header containing the names of all shared libraries.
# We use a stamp file to avoid uncessary recompilations. # We use a stamp file to avoid uncessary recompilations.
before-compile += $(common-objpfx)gnu/lib-names.h before-compile += $(common-objpfx)gnu/lib-names.h
ifeq ($(soversions.mk-done),t)
$(common-objpfx)gnu/lib-names.h: $(common-objpfx)gnu/lib-names.stmp; @: $(common-objpfx)gnu/lib-names.h: $(common-objpfx)gnu/lib-names.stmp; @:
$(common-objpfx)gnu/lib-names.stmp: $(common-objpfx)soversions.mk $(common-objpfx)gnu/lib-names.stmp: $(common-objpfx)soversions.mk
$(make-target-directory) $(make-target-directory)
@ -770,6 +772,7 @@ $(common-objpfx)gnu/lib-names.stmp: $(common-objpfx)soversions.mk
echo '#endif /* gnu/lib-names.h */';) > ${@:stmp=T} echo '#endif /* gnu/lib-names.h */';) > ${@:stmp=T}
$(move-if-change) ${@:stmp=T} ${@:stmp=h} $(move-if-change) ${@:stmp=T} ${@:stmp=h}
touch $@ touch $@
endif
common-generated += gnu/lib-names.h gnu/lib-names.stmp common-generated += gnu/lib-names.h gnu/lib-names.stmp