From 79cc983edcb5bb7320ba609124703a8c57ef3a9e Mon Sep 17 00:00:00 2001 From: "Janet B. Anderson" Date: Tue, 11 Dec 2007 20:23:00 +0000 Subject: [PATCH] Moved GNU_DIR def to CONFIG_COMMON. Moved *SHRLIB_LDFLAGS defs to CONFIG.gnuCommon. --- configure/CONFIG.gnuCommon | 2 ++ configure/CONFIG_COMMON | 6 ++++++ configure/os/CONFIG.Common.UnixCommon | 4 ---- configure/os/CONFIG.aix-ppc-gnu.aix-ppc-gnu | 9 +++------ configure/os/CONFIG.cygwin-x86.cygwin-x86 | 5 +++-- configure/os/CONFIG.freebsd-x86.freebsd-x86 | 9 ++------- configure/os/CONFIG.freebsd-x86_64.freebsd-x86_64 | 5 ----- configure/os/CONFIG.hpux-parisc-gnu.hpux-parisc-gnu | 3 --- configure/os/CONFIG.linux-ppc.linux-ppc | 10 ---------- .../os/CONFIG.linux-x86-borland.linux-x86-borland | 4 ++++ configure/os/CONFIG.linux-x86.linux-arm | 8 -------- configure/os/CONFIG.linux-x86.linux-cris | 6 ------ configure/os/CONFIG.linux-x86.linux-x86 | 5 ----- configure/os/CONFIG.linux-x86_64.linux-x86_64 | 5 ----- .../os/CONFIG.solaris-sparc-gnu.solaris-sparc-gnu | 3 --- configure/os/CONFIG.solaris-x86-gnu.solaris-x86-gnu | 4 ++-- configure/os/CONFIG.win32-x86-cygwin.win32-x86-cygwin | 2 ++ configure/os/CONFIG.win32-x86-mingw.win32-x86-mingw | 2 ++ configure/os/CONFIG_SITE.linux-x86_64.linux-x86_64 | 9 --------- 19 files changed, 26 insertions(+), 75 deletions(-) diff --git a/configure/CONFIG.gnuCommon b/configure/CONFIG.gnuCommon index 75b06defa..4207a3064 100644 --- a/configure/CONFIG.gnuCommon +++ b/configure/CONFIG.gnuCommon @@ -53,6 +53,8 @@ STATIC_LDFLAGS_YES = -static STATIC_LDFLAGS_NO = SHRLIB_CFLAGS = -fPIC +SHRLIB_LDFLAGS = -shared -fPIC +LOADABLE_SHRLIB_LDFLAGS = -shared -fPIC GNU_LDLIBS_YES = -lgcc diff --git a/configure/CONFIG_COMMON b/configure/CONFIG_COMMON index 93a8bc4f8..704c2b3ac 100644 --- a/configure/CONFIG_COMMON +++ b/configure/CONFIG_COMMON @@ -47,6 +47,12 @@ CHECK_RELEASE_YES = checkRelease CHECK_RELEASE_NO = CHECK_RELEASE_WARN = warnRelease +#------------------------------------------------------- +# GNU directory +# GNU_DIR definition is here because it is used to find +# READLINE library even if GNU compiler is not used +GNU_DIR = /usr + #------------------------------------------------------- # Directories diff --git a/configure/os/CONFIG.Common.UnixCommon b/configure/os/CONFIG.Common.UnixCommon index d71927649..a5733d40f 100644 --- a/configure/os/CONFIG.Common.UnixCommon +++ b/configure/os/CONFIG.Common.UnixCommon @@ -12,10 +12,6 @@ # Unix valid build types VALID_BUILDS = Host Ioc -#------------------------------------------------------- -# Gnu directory -GNU_DIR = /usr/local - #------------------------------------------------------- # Unix prefix and suffix definitions EXE = diff --git a/configure/os/CONFIG.aix-ppc-gnu.aix-ppc-gnu b/configure/os/CONFIG.aix-ppc-gnu.aix-ppc-gnu index af4959831..989bda8ff 100644 --- a/configure/os/CONFIG.aix-ppc-gnu.aix-ppc-gnu +++ b/configure/os/CONFIG.aix-ppc-gnu.aix-ppc-gnu @@ -1,8 +1,8 @@ -# CONFIG.aix-ppc.aix-ppc +# CONFIG.aix-ppc-gnu.aix-ppc-gnu # # -# Definitions for aix-ppc host - aix-ppc target builds -# Sites may override these definitions in CONFIG_SITE.aix-ppc.aix-ppc +# Definitions for aix-ppc-gnu host - aix-ppc-gnu target builds +# Sites may override these definitions in CONFIG_SITE.aix-ppc-gnu.aix-ppc-gnu #------------------------------------------------------- # Include common gnu compiler definitions @@ -14,6 +14,3 @@ AR = ar ARFLAGS = rcv RANLIB = ranlib -t -SHRLIB_LDFLAGS = -shared -fPIC -LOADABLE_SHRLIB_LDFLAGS = -shared -fPIC - diff --git a/configure/os/CONFIG.cygwin-x86.cygwin-x86 b/configure/os/CONFIG.cygwin-x86.cygwin-x86 index 8b069d6ed..b347bb6ac 100644 --- a/configure/os/CONFIG.cygwin-x86.cygwin-x86 +++ b/configure/os/CONFIG.cygwin-x86.cygwin-x86 @@ -19,8 +19,10 @@ AR = ar -rc LD = ld -r RANLIB = ranlib -# Avoid position-independent code is always generated message +# Avoid 'position-independent code is always generated' message SHRLIB_CFLAGS = +SHRLIB_LDFLAGS = -shared +LOADABLE_SHRLIB_LDFLAGS = -shared # -ansi eliminates strdup CONFORM_CFLAGS_ANSI = @@ -28,4 +30,3 @@ CONFORM_CFLAGS_STRICT = -pedantic CONFORM_CXXFLAGS_NORMAL = CONFORM_CXXFLAGS_STRICT = -pedantic - diff --git a/configure/os/CONFIG.freebsd-x86.freebsd-x86 b/configure/os/CONFIG.freebsd-x86.freebsd-x86 index dfa84b478..9b4d88769 100644 --- a/configure/os/CONFIG.freebsd-x86.freebsd-x86 +++ b/configure/os/CONFIG.freebsd-x86.freebsd-x86 @@ -1,19 +1,14 @@ # $Id$ # -# Definitions for freebsd-x86_64 host - freebsd-x86_64 target builds -# Sites may override these definitions in CONFIG_SITE.freebsd-x86_64.freebsd-x86_64 +# Definitions for freebsd-x86 host - freebsd-x86 target builds +# Sites may override these definitions in CONFIG_SITE.freebsd-x86.freebsd-x86 #------------------------------------------------------- # Include common gnu compiler definitions include $(CONFIG)/CONFIG.gnuCommon -GNU_DIR = /usr - STATIC_LDFLAGS_YES= -Wl,-Bstatic STATIC_LDFLAGS_NO= STATIC_LDLIBS_YES= -Wl,-Bdynamic STATIC_LDLIBS_NO= -SHRLIB_LDFLAGS += -shared -fPIC -LOADABLE_SHRLIB_LDFLAGS = -shared -fPIC - diff --git a/configure/os/CONFIG.freebsd-x86_64.freebsd-x86_64 b/configure/os/CONFIG.freebsd-x86_64.freebsd-x86_64 index dfa84b478..a1e35669e 100644 --- a/configure/os/CONFIG.freebsd-x86_64.freebsd-x86_64 +++ b/configure/os/CONFIG.freebsd-x86_64.freebsd-x86_64 @@ -7,13 +7,8 @@ # Include common gnu compiler definitions include $(CONFIG)/CONFIG.gnuCommon -GNU_DIR = /usr - STATIC_LDFLAGS_YES= -Wl,-Bstatic STATIC_LDFLAGS_NO= STATIC_LDLIBS_YES= -Wl,-Bdynamic STATIC_LDLIBS_NO= -SHRLIB_LDFLAGS += -shared -fPIC -LOADABLE_SHRLIB_LDFLAGS = -shared -fPIC - diff --git a/configure/os/CONFIG.hpux-parisc-gnu.hpux-parisc-gnu b/configure/os/CONFIG.hpux-parisc-gnu.hpux-parisc-gnu index c51c71aa9..8a76607c8 100644 --- a/configure/os/CONFIG.hpux-parisc-gnu.hpux-parisc-gnu +++ b/configure/os/CONFIG.hpux-parisc-gnu.hpux-parisc-gnu @@ -24,6 +24,3 @@ STATIC_LDLIBS_NO = POSIX_CPPFLAGS += -D_REENTRANT -D_PTHREADS -D_POSIX_C_SOURCE=199506L USR_SYS_LIBS += pthread -# C++ templates need PIC definition also in link phase -SHRLIB_LDFLAGS += -shared -fPIC -LOADABLE_SHRLIB_LDFLAGS += $(SHRLIB_LDFLAGS) diff --git a/configure/os/CONFIG.linux-ppc.linux-ppc b/configure/os/CONFIG.linux-ppc.linux-ppc index 7fa3b4b91..3c437df59 100644 --- a/configure/os/CONFIG.linux-ppc.linux-ppc +++ b/configure/os/CONFIG.linux-ppc.linux-ppc @@ -8,13 +8,3 @@ # Include common gnu compiler definitions include $(CONFIG)/CONFIG.gnuCommon -GNU_DIR = /usr - -CC = $(GNU_BIN)/gcc -CCC = $(GNU_BIN)/g++ - -SHRLIB_LDFLAGS = -shared -fPIC -LOADABLE_SHRLIB_LDFLAGS = -shared -fPIC - -GNU_LDLIBS_YES = -lgcc - diff --git a/configure/os/CONFIG.linux-x86-borland.linux-x86-borland b/configure/os/CONFIG.linux-x86-borland.linux-x86-borland index 48331833c..e1747e9fb 100644 --- a/configure/os/CONFIG.linux-x86-borland.linux-x86-borland +++ b/configure/os/CONFIG.linux-x86-borland.linux-x86-borland @@ -9,6 +9,10 @@ # Include common gnu compiler definitions include $(CONFIG)/CONFIG.gnuCommon SHRLIB_CFLAGS = +SHRLIB_LDFLAGS = +LOADABLE_SHRLIB_LDFLAGS = +GPROF=NO +PROFILE=NO GNU_DIR = /usr diff --git a/configure/os/CONFIG.linux-x86.linux-arm b/configure/os/CONFIG.linux-x86.linux-arm index b6c249e85..2d38bfcc9 100644 --- a/configure/os/CONFIG.linux-x86.linux-arm +++ b/configure/os/CONFIG.linux-x86.linux-arm @@ -4,17 +4,9 @@ # Sites may override these definitions in CONFIG_SITE.linux-x86.linux-arm #------------------------------------------------------- -# Include common gnu compiler definitions -include $(CONFIG)/CONFIG.gnuCommon - -GNU_DIR = /usr - # Copied from x86.x86 STATIC_LDFLAGS_YES= -Wl,-Bstatic STATIC_LDFLAGS_NO= STATIC_LDLIBS_YES= -Wl,-Bdynamic STATIC_LDLIBS_NO= -SHRLIB_LDFLAGS += -shared -fPIC -LOADABLE_SHRLIB_LDFLAGS = -shared -fPIC - diff --git a/configure/os/CONFIG.linux-x86.linux-cris b/configure/os/CONFIG.linux-x86.linux-cris index 03e2a6fe6..8244916e5 100644 --- a/configure/os/CONFIG.linux-x86.linux-cris +++ b/configure/os/CONFIG.linux-x86.linux-cris @@ -8,9 +8,6 @@ # Sites may override these definitions in CONFIG_SITE.linux-x86.linux-cris #------------------------------------------------------- -# Include common gnu compiler definitions -include $(CONFIG)/CONFIG.gnuCommon - GNU_DIR = $(CRIS_CROSS_COMPILER) #STATIC_... @@ -34,9 +31,6 @@ endif STATIC_LDLIBS_YES= STATIC_LDLIBS_NO= -SHRLIB_LDFLAGS += -shared -fPIC -LOADABLE_SHRLIB_LDFLAGS = -shared -fPIC - OPT_CXXFLAGS_YES = -Os ifeq ($(STATIC_BUILD), YES) diff --git a/configure/os/CONFIG.linux-x86.linux-x86 b/configure/os/CONFIG.linux-x86.linux-x86 index 0fd599124..2e3746012 100644 --- a/configure/os/CONFIG.linux-x86.linux-x86 +++ b/configure/os/CONFIG.linux-x86.linux-x86 @@ -9,13 +9,8 @@ # Include common gnu compiler definitions include $(CONFIG)/CONFIG.gnuCommon -GNU_DIR = /usr - STATIC_LDFLAGS_YES= -Wl,-Bstatic STATIC_LDFLAGS_NO= STATIC_LDLIBS_YES= -Wl,-Bdynamic STATIC_LDLIBS_NO= -SHRLIB_LDFLAGS += -shared -fPIC -LOADABLE_SHRLIB_LDFLAGS = -shared -fPIC - diff --git a/configure/os/CONFIG.linux-x86_64.linux-x86_64 b/configure/os/CONFIG.linux-x86_64.linux-x86_64 index 72aaaa88c..9cbb7b729 100644 --- a/configure/os/CONFIG.linux-x86_64.linux-x86_64 +++ b/configure/os/CONFIG.linux-x86_64.linux-x86_64 @@ -9,13 +9,8 @@ # Include common gnu compiler definitions include $(CONFIG)/CONFIG.gnuCommon -GNU_DIR = /usr - STATIC_LDFLAGS_YES= -Wl,-Bstatic STATIC_LDFLAGS_NO= STATIC_LDLIBS_YES= -Wl,-Bdynamic STATIC_LDLIBS_NO= -SHRLIB_LDFLAGS += -shared -fPIC -LOADABLE_SHRLIB_LDFLAGS = -shared -fPIC - diff --git a/configure/os/CONFIG.solaris-sparc-gnu.solaris-sparc-gnu b/configure/os/CONFIG.solaris-sparc-gnu.solaris-sparc-gnu index 234b28a7b..40f17e2c6 100644 --- a/configure/os/CONFIG.solaris-sparc-gnu.solaris-sparc-gnu +++ b/configure/os/CONFIG.solaris-sparc-gnu.solaris-sparc-gnu @@ -19,8 +19,5 @@ STATIC_LDFLAGS_NO= STATIC_LDLIBS_YES= -Wl,-Bdynamic STATIC_LDLIBS_NO= -SHRLIB_LDFLAGS += -shared -fPIC -LOADABLE_SHRLIB_LDFLAGS = -shared -fPIC - OP_SYS_LDFLAGS += -z ignore -z combreloc -z lazyload diff --git a/configure/os/CONFIG.solaris-x86-gnu.solaris-x86-gnu b/configure/os/CONFIG.solaris-x86-gnu.solaris-x86-gnu index e681ee11e..a2436abe0 100644 --- a/configure/os/CONFIG.solaris-x86-gnu.solaris-x86-gnu +++ b/configure/os/CONFIG.solaris-x86-gnu.solaris-x86-gnu @@ -14,7 +14,7 @@ AR = ar -rc RANLIB= LD = ld -r -SHRLIB_LDFLAGS += -shared -fPIC -h $@ -z defs -LOADABLE_SHRLIB_LDFLAGS += -shared -fPIC -h $@ +SHRLIB_LDFLAGS += -h $@ -z defs +LOADABLE_SHRLIB_LDFLAGS += -h $@ OP_SYS_LDFLAGS += -z ignore -z combreloc -z lazyload diff --git a/configure/os/CONFIG.win32-x86-cygwin.win32-x86-cygwin b/configure/os/CONFIG.win32-x86-cygwin.win32-x86-cygwin index 10e69e04d..86588dfd2 100644 --- a/configure/os/CONFIG.win32-x86-cygwin.win32-x86-cygwin +++ b/configure/os/CONFIG.win32-x86-cygwin.win32-x86-cygwin @@ -19,6 +19,8 @@ RANLIB = ranlib # Dont use -fPIC: with -fPIC we get # "warning: -fPIC ignored for target (all code is position independent) " SHRLIB_CFLAGS = +SHRLIB_LDFLAGS = -shared +LOADABLE_SHRLIB_LDFLAGS = -shared # Dont use -ansi: -ansi eliminates strdup and _tempnam CONFORM_CFLAGS_ANSI = diff --git a/configure/os/CONFIG.win32-x86-mingw.win32-x86-mingw b/configure/os/CONFIG.win32-x86-mingw.win32-x86-mingw index 993bd3587..8bb6a530d 100644 --- a/configure/os/CONFIG.win32-x86-mingw.win32-x86-mingw +++ b/configure/os/CONFIG.win32-x86-mingw.win32-x86-mingw @@ -21,6 +21,8 @@ RANLIB = ranlib # Avoid "position-independent code is always generated" message SHRLIB_CFLAGS = +SHRLIB_LDFLAGS = -shared +LOADABLE_SHRLIB_LDFLAGS = -shared # Dont use -ansi option: eliminates strdup and _tempnam CONFORM_CFLAGS_ANSI = diff --git a/configure/os/CONFIG_SITE.linux-x86_64.linux-x86_64 b/configure/os/CONFIG_SITE.linux-x86_64.linux-x86_64 index 3b1bfe6bf..ce4c20893 100644 --- a/configure/os/CONFIG_SITE.linux-x86_64.linux-x86_64 +++ b/configure/os/CONFIG_SITE.linux-x86_64.linux-x86_64 @@ -5,13 +5,4 @@ # Site specific definitions for linux-x86_64 host - linux-x86_64 target builds #------------------------------------------------------- -# -z defs causes problems for Linux -#The -z defs option causes the linker to not ignore -# unresolved references when building a shared library -# Forces a fatal error if any undefined symbols remain -# at the end of the link -# So we will override the definition of SHRLIB_LDFLAGS -# in "CONFIG.linux-x86_64.linux-x86_64" - -SHRLIB_LDFLAGS= -shared