database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-02 11:44:50 +03:00
Code

Unlink static libraries before rebuilding them.

Browse Source 
When the library already exists in the build directory, "ar" preserves
members not named on its command line.  This mattered when, for example,
a "configure" rerun dropped a file from $(LIBOBJS).  libpgport carried
the obsolete member until "make clean".  Back-patch to 9.0 (all
supported versions).
This commit is contained in:
Noah Misch 2015-03-01 13:05:23 -05:00
parent 6f419958a6
commit c3b0baf910
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Makefile.shlib
View File

@ -318,6 +318,7 @@ all-shared-lib: $(shlib)
ifndef haslibarule ifndef haslibarule
$(stlib): $(OBJS) | $(SHLIB_PREREQS) $(stlib): $(OBJS) | $(SHLIB_PREREQS)
rm -f $@
$(LINK.static) $@ $^ $(LINK.static) $@ $^
$(RANLIB) $@ $(RANLIB) $@
endif #haslibarule endif #haslibarule
@ -360,6 +361,7 @@ else # PORTNAME == aix
# AIX case # AIX case
$(shlib) $(stlib): $(OBJS) | $(SHLIB_PREREQS) $(shlib) $(stlib): $(OBJS) | $(SHLIB_PREREQS)
rm -f $(stlib)
$(LINK.static) $(stlib) $^ $(LINK.static) $(stlib) $^
$(RANLIB) $(stlib) $(RANLIB) $(stlib)
$(MKLDEXPORT) $(stlib) >$(exports_file) $(MKLDEXPORT) $(stlib) >$(exports_file)
@ -380,6 +382,7 @@ $(shlib): $(OBJS) | $(SHLIB_PREREQS)
$(CC) $(CFLAGS) -shared -o $@ $(OBJS) $(LDFLAGS) $(LDFLAGS_SL) $(SHLIB_LINK) $(LIBS) $(LDAP_LIBS_BE) $(CC) $(CFLAGS) -shared -o $@ $(OBJS) $(LDFLAGS) $(LDFLAGS_SL) $(SHLIB_LINK) $(LIBS) $(LDAP_LIBS_BE)
$(stlib): $(OBJS) | $(SHLIB_PREREQS) $(stlib): $(OBJS) | $(SHLIB_PREREQS)
rm -f $@
$(LINK.static) $@ $^ $(LINK.static) $@ $^
$(RANLIB) $@ $(RANLIB) $@

2
src/port/Makefile
View File

@ -50,6 +50,7 @@ uninstall:
rm -f '$(DESTDIR)$(libdir)/libpgport.a' rm -f '$(DESTDIR)$(libdir)/libpgport.a'
libpgport.a: $(OBJS) libpgport.a: $(OBJS)
rm -f $@
$(AR) $(AROPT) $@ $^ $(AR) $(AROPT) $@ $^
# thread.o needs PTHREAD_CFLAGS (but thread_srv.o does not) # thread.o needs PTHREAD_CFLAGS (but thread_srv.o does not)
@ -60,6 +61,7 @@ thread.o: CFLAGS+=$(PTHREAD_CFLAGS)
# #
libpgport_srv.a: $(OBJS_SRV) libpgport_srv.a: $(OBJS_SRV)
rm -f $@
$(AR) $(AROPT) $@ $^ $(AR) $(AROPT) $@ $^
# Because this uses its own compilation rule, it doesn't use the # Because this uses its own compilation rule, it doesn't use the