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

Commit63b22d8

Browse files
committed
cleanup for LINUX_ELF
1 parent37c168f commit63b22d8

File tree

4 files changed

+18
-19
lines changed

4 files changed

+18
-19
lines changed

‎src/Makefile.global

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.84 1997/01/08 08:30:21 bryanh Exp $
10+
# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.85 1997/01/10 18:54:49 momjian Exp $
1111
#
1212
# NOTES
1313
# Essentially all Postgres make files include this file and use the
@@ -71,7 +71,7 @@ PORTNAME= UNDEFINED
7171
# Ignore LINUX_ELF if you're not using Linux. But if you are, and you're
7272
# compiling to a.out (which means you're using the dld dynamic loading
7373
# library), set LINUX_ELF to null in Makefile.custom.
74-
LINUX_ELF=1
74+
LINUX_ELF=true
7575

7676
LIBPQDIR:= $(SRCDIR)/libpq
7777

‎src/backend/utils/fmgr/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for utils/fmgr
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/utils/fmgr/Makefile,v 1.2 1996/11/09 06:23:18 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/utils/fmgr/Makefile,v 1.3 1997/01/10 18:55:00 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -20,9 +20,9 @@ CFLAGS+=$(INCLUDE_OPT)
2020
ifeq ($(PORTNAME), linux)
2121
# LINUX_ELF tells us to use the ELF dynamic load facilities that come with
2222
# Linux.
23-
ifdefLINUX_ELF
24-
CFLAGS+=-DLINUX_ELF
25-
endif
23+
ifdef LINUX_ELF
24+
CFLAGS+=-DLINUX_ELF
25+
endif
2626
endif
2727

2828
OBJS = dfmgr.o fmgr.o

‎src/interfaces/libpgtcl/Makefile

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile,v 1.7 1997/01/1017:40:07 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile,v 1.8 1997/01/1018:55:14 momjian Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -25,8 +25,12 @@ ifdef KRBVERS
2525
CFLAGS+=$(KRBFLAGS)
2626
endif
2727

28-
ifdefLINUX_ELF
29-
CFLAGS += -fPIC
28+
ifeq ($(PORTNAME), linux)
29+
ifdef LINUX_ELF
30+
ifeq ($(CC), gcc)
31+
CFLAGS += -fpic -fPIC
32+
endif
33+
endif
3034
endif
3135

3236
OBJS= pgtcl.o pgtclCmds.o pgtclId.o

‎src/interfaces/libpq/Makefile

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.25 1997/01/1004:01:09 vadim Exp $
10+
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.26 1997/01/1018:55:24 momjian Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -32,16 +32,11 @@ OBJS= fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-lobj.o \
3232

3333
shlib :=
3434
install-shlib-dep :=
35-
ifdefLINUX_ELF
36-
install-shlib-dep := install-shlib
3735
ifeq ($(PORTNAME), linux)
38-
shlib := libpq.so.1
39-
endif
40-
ifeq ($(PORTNAME), BSD44_derived)
41-
shlib := libpq.so.1.0
42-
CFLAGS+= -fpic -DPIC
43-
LDFLAGS=-Bshareable -Bforcearchive
44-
endif
36+
ifdef LINUX_ELF
37+
install-shlib-dep := install-shlib
38+
shlib := libpq.so.1
39+
endif
4540
endif
4641

4742
all: libpq.a$(shlib) c.h

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp