NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit24ed6d6

committed

From: Darren King <aixssd!darrenk@abs.net>

Subject: [PATCHES] AIX make patch resubmitted.Misc patches for AIX from Darren:1) New src/makefiles/Makefile.aix This patch should only be applied if the following patch (4) is applied to backend/Makefile! Still looking into having configure determine the last line to do the shared link. The 325 code will work for 41, so I put that in as the default. Included a commented out 41 line for completeness.*and*4) Patch the backend Makefile. I've reviewed this patch with respect to the other ports that use MAKE_EXPORTS (svr4 and univel) as closely as I could and I don't see where it will break them. If it does, please let me know and I'll rework it somehow.

1 parent3e87138 commit24ed6d6Copy full SHA for 24ed6d6

File tree

2 files changed

-12

lines changed

src/backend
- Makefile
- port/aix
  - mkldexport.sh

2 files changed

-12

lines changed

`‎src/backend/Makefile`

Lines changed: 5 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`	`#`
`35`	`35`	`#`
`36`	`36`	`# IDENTIFICATION`
`37`		`-# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.23 1997/04/04 10:38:49 scrappy Exp $`
	`37`	`+# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.24 1997/05/22 00:11:23 scrappy Exp $`
`38`	`38`	`#`
`39`	`39`	`#-------------------------------------------------------------------------`
`40`	`40`
`@@ -51,13 +51,7 @@ endif`
`51`	`51`
`52`	`52`	`OBJS =$(DIRS:%=%/SUBSYS.o)`
`53`	`53`
`54`		`-ifeq ($(MAKE_EXPORTS), true)`
`55`		`-EXP = postgres$(EXPSUFF)`
`56`		`-else`
`57`		`-EXP =`
`58`		`-endif`
`59`		`-`
`60`		`-all: postgres$(EXP) global1.bki.source local1_template1.bki.source`
	`54`	`+all: postgres$(POSTGRES_IMP) global1.bki.source local1_template1.bki.source`
`61`	`55`
`62`	`56`	`postgres:$(OBJS) ../utils/version.o`
`63`	`57`	`$(CC) -o postgres$(OBJS) ../utils/version.o$(LDFLAGS)`
`@@ -96,7 +90,7 @@ fmgr.h:`
`96`	`90`
`97`	`91`	`#############################################################################`
`98`	`92`	`clean:`
`99`		`-rm -f postgres fmgr.h parse.h\`
	`93`	`+rm -f postgres$(POSTGRES_IMP)fmgr.h parse.h\`
`100`	`94`	`global1.bki.source local1_template1.bki.source`
`101`	`95`	`foriin$(DIRS);do$(MAKE) -C$$i clean PORTNAME=$(PORTNAME);done`
`102`	`96`
`@@ -119,13 +113,13 @@ clean:`
`119`	`113`	`# and (2) the parameters of a database system should be set at initdb time,`
`120`	`114`	`# not at postgres build time.`
`121`	`115`
`122`		`-install:$(LIBDIR)$(BINDIR)$(HEADERDIR) postgres$(EXP) fmgr.h\`
	`116`	`+install:$(LIBDIR)$(BINDIR)$(HEADERDIR) postgres$(POSTGRES_IMP) fmgr.h\`
`123`	`117`	`global1.bki.source local1_template1.bki.source \`
`124`	`118`	`libpq/pg_hba.conf.sample optimizer/geqo/pg_geqo.sample`
`125`	`119`
`126`	`120`	`$(INSTALL) $(INSTL_EXE_OPTS) postgres $(BINDIR)/postgres`
`127`	`121`	`ifeq ($(MAKE_EXPORTS), true)`
`128`		`-$(INSTALL) $(INSTLOPTS)postgres$(EXPSUFF) $(LIBDIR)/postgres$(EXPSUFF)`
	`122`	`+$(INSTALL) $(INSTLOPTS)$(POSTGRES_IMP) $(LIBDIR)/$(POSTGRES_IMP)`
`129`	`123`	`endif`
`130`	`124`	`@rm -f $(BINDIR)/postmaster`
`131`	`125`	`cd $(BINDIR); ln -s postgres postmaster`

`‎src/backend/port/aix/mkldexport.sh`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ if [ -z "$2" ]; then`
`33`	`33`	`else`
`34`	`34`	`echo'#!'$2/$OBJNAME`
`35`	`35`	`fi`
`36`		`-$NM -g$1\| \`
	`36`	`+$NM -Bg$1\| \`
`37`	`37`	`egrep' [TD]'\| \`
`38`	`38`	`sed -e's/.* //'\| \`
`39`	`39`	`egrep -v'\$'\| \`

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!

Commit24ed6d6

File tree

2 files changed

2 files changed

`‎src/backend/Makefile`

`‎src/backend/port/aix/mkldexport.sh`

0 commit comments