Commita0b7daa

committed

Apply freebsd specific patches dealign with ELF system from FreeBSD'sports collection ...

1 parent61f618e commita0b7daaCopy full SHA for a0b7daa

File tree

+15

-8

lines changed

+15

-8

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`# Copyright (c) 1998, Regents of the University of California`
`7`	`7`	`#`
`8`	`8`	`# IDENTIFICATION`
`9`		`-# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.8 1999/04/30 02:04:49 momjian Exp $`
	`9`	`+# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.9 1999/05/1704:13:24 scrappy Exp $`
`10`	`10`	`#`
`11`	`11`	`#-------------------------------------------------------------------------`
`12`	`12`
`@@ -59,10 +59,11 @@ install-shlib-dep :=`
`59`	`59`	`ifeq ($(PORTNAME), freebsd)`
`60`	`60`	`ifdef BSD_SHLIB`
`61`	`61`	`install-shlib-dep:= install-shlib`
`62`		`- shlib:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)`
`63`	`62`	`ifdef ELF_SYSTEM`
`64`		`- LDFLAGS_SL:= -x -Bshareable`
	`63`	`+ shlib:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)`
	`64`	`+ LDFLAGS_SL:= -x -shared -soname $(shlib)`
`65`	`65`	`else`
	`66`	`+ shlib:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)`
`66`	`67`	`LDFLAGS_SL:= -x -Bshareable -Bforcearchive`
`67`	`68`	`endif`
`68`	`69`	`CFLAGS+= $(CFLAGS_SL)`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -83,11 +83,13 @@ BSD44_derived_dlsym(void handle, const char name)`
`83`	`83`	`void*vp;`
`84`	`84`	`charbuf[BUFSIZ];`
`85`	`85`
	`86`	`+#ifndef__ELF__`
`86`	`87`	`if (*name!='_')`
`87`	`88`	`{`
`88`	`89`	`sprintf(buf,"_%s",name);`
`89`	`90`	`name=buf;`
`90`	`91`	`}`
	`92`	`+#endif`
`91`	`93`	`if ((vp=dlsym(handle, (char)name))== (void)NULL)`
`92`	`94`	`sprintf(error_message,"dlsym (%s) failed",name);`
`93`	`95`	`returnvp;`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -625,8 +625,8 @@ case "$host_os" in`
`625`	`625`	`aux*) os=aux need_tas=no ;;`
`626`	`626`	`linux*) os=linux need_tas=no ;;`
`627`	`627`	`bsdi*) os=bsdi need_tas=no ;;`
`628`		`- freebsd3\|freebsd4) os=freebsd need_tas=no elf=yes ;;`
`629`	`628`	`freebsd1\|freebsd2) os=freebsd need_tas=no ;;`
	`629`	`+ freebsd*) os=freebsd need_tas=no elf=yes ;;`
`630`	`630`	`netbsd*)`
`631`	`631`	`os=bsd need_tas=no`
`632`	`632`	`case"$host_cpu"in`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,8 @@ case "$host_os" in`
`20`	`20`	`aux*) os=aux need_tas=no ;;`
`21`	`21`	`linux*) os=linux need_tas=no ;;`
`22`	`22`	`bsdi*) os=bsdi need_tas=no ;;`
`23`		`- freebsd3\|freebsd4) os=freebsd need_tas=no elf=yes ;;`
`24`	`23`	`freebsd1\|freebsd2) os=freebsd need_tas=no ;;`
	`24`	`+ freebsd*) os=freebsd need_tas=no elf=yes ;;`
`25`	`25`	`netbsd*)`
`26`	`26`	`os=bsd need_tas=no`
`27`	`27`	`case "$host_cpu" in`

Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,17 @@`
	`1`	`+ifdef ELF_SYSTEM`
	`2`	`+LDFLAGS+=-export-dynamic`
	`3`	`+endif`
	`4`	`+`
`1`	`5`	`%.so: %.o`
	`6`	`+ifdef ELF_SYSTEM`
	`7`	`+$(LD) -x -shared -o $@ $<`
	`8`	`+else`
`2`	`9`	`$(LD) -x -r -o $<.obj $<`
`3`	`10`	`@echo building shared object $@`
`4`	`11`	`@rm -f $@.pic`
`5`	`12`	@${AR} cq $@.pic `lorder $<.obj \| tsort`
`6`	`13`	`${RANLIB} $@.pic`
`7`	`14`	`@rm -f $@`
`8`		`-ifdef ELF_SYSTEM`
`9`		`-$(LD) -x -Bshareable -o $@ $@.pic`
`10`		`-else`
`11`	`15`	`$(LD) -x -Bshareable -Bforcearchive -o $@ $@.pic`
`12`	`16`	`endif`
`13`	`17`

Comments

(0)