NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit424793f

committed

Unlink static libraries before rebuilding them.

When the library already exists in the build directory, "ar" preservesmembers not named on its command line. This mattered when, for example,a "configure" rerun dropped a file from $(LIBOBJS). libpgport carriedthe obsolete member until "make clean". Back-patch to 9.0 (allsupported versions).

1 parent097fe19 commit424793fCopy full SHA for 424793f

File tree

3 files changed

-0

lines changed

src
- Makefile.shlib
- common
  - Makefile
- port
  - Makefile

3 files changed

-0

lines changed

`‎src/Makefile.shlib`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -296,6 +296,7 @@ all-shared-lib: $(shlib)`
`296`	`296`
`297`	`297`	`ifndef haslibarule`
`298`	`298`	`$(stlib): $(OBJS) \| $(SHLIB_PREREQS)`
	`299`	`+rm -f $@`
`299`	`300`	`$(LINK.static) $@ $^`
`300`	`301`	`$(RANLIB) $@`
`301`	`302`	`endif #haslibarule`
`@@ -337,6 +338,7 @@ else # PORTNAME == aix`
`337`	`338`
`338`	`339`	`# AIX case`
`339`	`340`	`$(shlib) $(stlib): $(OBJS) \| $(SHLIB_PREREQS)`
	`341`	`+rm -f $(stlib)`
`340`	`342`	`$(LINK.static) $(stlib) $^`
`341`	`343`	`$(RANLIB) $(stlib)`
`342`	`344`	`$(MKLDEXPORT) $(stlib) >$(exports_file)`
`@@ -356,6 +358,7 @@ $(shlib): $(OBJS) \| $(SHLIB_PREREQS)`
`356`	`358`	`$(CC) $(CFLAGS) -shared -o $@ $(OBJS) $(LDFLAGS) $(LDFLAGS_SL) $(SHLIB_LINK) $(LIBS) $(LDAP_LIBS_BE)`
`357`	`359`
`358`	`360`	`$(stlib): $(OBJS) \| $(SHLIB_PREREQS)`
	`361`	`+rm -f $@`
`359`	`362`	`$(LINK.static) $@ $^`
`360`	`363`	`$(RANLIB) $@`
`361`	`364`

`‎src/common/Makefile`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -43,13 +43,15 @@ uninstall:`
`43`	`43`	`rm -f'$(DESTDIR)$(libdir)/libpgcommon.a'`
`44`	`44`
`45`	`45`	`libpgcommon.a:$(OBJS_FRONTEND)`
	`46`	`+rm -f$@`
`46`	`47`	`$(AR)$(AROPT)$@$^`
`47`	`48`
`48`	`49`	`#`
`49`	`50`	`# Server versions of object files`
`50`	`51`	`#`
`51`	`52`
`52`	`53`	`libpgcommon_srv.a:$(OBJS_SRV)`
	`54`	`+rm -f$@`
`53`	`55`	`$(AR)$(AROPT)$@$^`
`54`	`56`
`55`	`57`	`# Because this uses its own compilation rule, it doesn't use the`

`‎src/port/Makefile`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ uninstall:`
`51`	`51`	`rm -f'$(DESTDIR)$(libdir)/libpgport.a'`
`52`	`52`
`53`	`53`	`libpgport.a:$(OBJS)`
	`54`	`+rm -f$@`
`54`	`55`	`$(AR)$(AROPT)$@$^`
`55`	`56`
`56`	`57`	`# thread.o needs PTHREAD_CFLAGS (but thread_srv.o does not)`
`@@ -61,6 +62,7 @@ thread.o: CFLAGS+=$(PTHREAD_CFLAGS)`
`61`	`62`	`#`
`62`	`63`
`63`	`64`	`libpgport_srv.a:$(OBJS_SRV)`
	`65`	`+rm -f$@`
`64`	`66`	`$(AR)$(AROPT)$@$^`
`65`	`67`
`66`	`68`	`# Because this uses its own compilation rule, it doesn't use the`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit424793f

File tree

3 files changed

3 files changed

`‎src/Makefile.shlib`

`‎src/common/Makefile`

`‎src/port/Makefile`

0 commit comments