Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit15d61bb

Browse files
committed
Minor FreeBSD fixes put in placeFrom: SHIOZAKI Takehiko <takehi-s@ascii.co.jp>I tried snapshot(Oct30) and made some patches.# I think that it is confused to manage both Makefile.shlib and# makefiles/Makefile.*, don't you?* configure Now FreeBSD 2.X is not supported..., so I added its entry. If ELF_SYSTEM is set, gmake treat it defined even though it is "false". So nothing should be set to use "ifdef". BSD_SHLIB etc. may have same problems.* Makefile.shlib As you said, FreeBSD entry is much like BSD's. I only added ELF_SYSTEM code.* makefiles/Makefile.freebsd Ifdef/else/endif can not be indented with TABs.
1 parent2e18525 commit15d61bb

File tree

4 files changed

+24
-11
lines changed

4 files changed

+24
-11
lines changed

‎src/Makefile.shlib‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# Copyright (c) 1998, Regents of the University of California
77
#
88
# IDENTIFICATION
9-
# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.2 1998/10/28 06:49:04 thomas Exp $
9+
# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.3 1998/10/31 03:58:51 scrappy Exp $
1010
#
1111
#-------------------------------------------------------------------------
1212

@@ -56,12 +56,25 @@ install-shlib-dep :=
5656
# Makefile.global (or really Makefile.port) to supply DLSUFFIX and other
5757
# symbols.
5858

59+
ifeq ($(PORTNAME), freebsd)
60+
ifdef BSD_SHLIB
61+
install-shlib-dep:= install-shlib
62+
shlib:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
63+
ifdef ELF_SYSTEM
64+
LDFLAGS_SL:= -x -Bshareable
65+
else
66+
LDFLAGS_SL:= -x -Bshareable -Bforcearchive
67+
endif
68+
CFLAGS+= $(CFLAGS_SL)
69+
endif
70+
endif
71+
5972
ifeq ($(PORTNAME), bsd)
6073
ifdef BSD_SHLIB
6174
install-shlib-dep:= install-shlib
62-
shlib:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
63-
LDFLAGS_SL:= -x -Bshareable -Bforcearchive
64-
CFLAGS+= $(CFLAGS_SL)
75+
shlib:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
76+
LDFLAGS_SL:= -x -Bshareable -Bforcearchive
77+
CFLAGS+= $(CFLAGS_SL)
6578
endif
6679
endif
6780

‎src/configure‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,7 @@ case "$host_os" in
618618
linux*) os=linux need_tas=no ;;
619619
bsdi*) os=bsdi need_tas=no ;;
620620
freebsd3*) os=freebsd need_tas=no elf=yes ;;
621-
freebsd1*) os=freebsd need_tas=no ;;
621+
freebsd12*) os=freebsd need_tas=no ;;
622622
netbsd*|openbsd*) os=bsd need_tas=no ;;
623623
dgux*) os=dgux need_tas=no ;;
624624
aix*) os=aix need_tas=no ;;

‎src/configure.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ case "$host_os" in
1717
linux*) os=linux need_tas=no ;;
1818
bsdi*) os=bsdi need_tas=no ;;
1919
freebsd3*) os=freebsd need_tas=no elf=yes ;;
20-
freebsd1*) os=freebsd need_tas=no ;;
20+
freebsd[12]*) os=freebsd need_tas=no ;;
2121
netbsd*|openbsd*) os=bsd need_tas=no ;;
2222
dgux*) os=dgux need_tas=no ;;
2323
aix*) os=aix need_tas=no ;;

‎src/makefiles/Makefile.freebsd‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
@${AR} cq $@.pic `lorder $<.obj | tsort`
66
${RANLIB} $@.pic
77
@rm -f $@
8-
ifdef ELF_SYSTEM
9-
$(LD) -x -Bshareable -o $@ $@.pic
10-
else
11-
$(LD) -x -Bshareable -Bforcearchive -o $@ $@.pic
12-
endif
8+
ifdef ELF_SYSTEM
9+
$(LD) -x -Bshareable -o $@ $@.pic
10+
else
11+
$(LD) -x -Bshareable -Bforcearchive -o $@ $@.pic
12+
endif
1313

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp