diff options
| author | Kris Kennaway <kris@FreeBSD.org> | 2004-03-15 07:57:49 +0000 |
|---|---|---|
| committer | Kris Kennaway <kris@FreeBSD.org> | 2004-03-15 07:57:49 +0000 |
| commit | 3547b5112ebb45951155d6f4ad8e53dd2bed5c44 (patch) | |
| tree | 31eb139303a85dabd63f062e95df874d1b5c6595 /devel/libafterbase | |
| parent | ed35f851d19c2fcadf0bd140732355cf18384e47 (diff) | |
| download | ports-3547b5112ebb45951155d6f4ad8e53dd2bed5c44.tar.gz ports-3547b5112ebb45951155d6f4ad8e53dd2bed5c44.zip | |
Better fix for amd64: don't pessimize the lib.a by compiling the object
files with -fPIC; instead, build them twice with and without -fPIC.
Notes
Notes:
svn path=/head/; revision=104054
Diffstat (limited to 'devel/libafterbase')
| -rw-r--r-- | devel/libafterbase/Makefile | 1 | ||||
| -rw-r--r-- | devel/libafterbase/files/patch-Makefile.in | 51 |
2 files changed, 43 insertions, 9 deletions
diff --git a/devel/libafterbase/Makefile b/devel/libafterbase/Makefile index 0b58ebb16ec4..7c344830a24c 100644 --- a/devel/libafterbase/Makefile +++ b/devel/libafterbase/Makefile @@ -19,7 +19,6 @@ COMMENT= AfterStep basic functionality library USE_REINPLACE= yes USE_X_PREFIX= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CFLAGS="${CFLAGS} -fPIC" CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --enable-sharedlibs --with-x INSTALLS_SHLIB= yes diff --git a/devel/libafterbase/files/patch-Makefile.in b/devel/libafterbase/files/patch-Makefile.in index 3d9336168c38..1674cc48f26a 100644 --- a/devel/libafterbase/files/patch-Makefile.in +++ b/devel/libafterbase/files/patch-Makefile.in @@ -1,6 +1,18 @@ ---- Makefile.in.orig Wed Dec 19 06:54:34 2001 -+++ Makefile.in Sat Jan 12 02:43:00 2002 -@@ -54,7 +54,7 @@ +--- Makefile.in.orig Tue Jan 15 12:53:17 2002 ++++ Makefile.in Sun Mar 14 23:56:38 2004 +@@ -33,6 +33,11 @@ + regexp.o safemalloc.o selfdiag.o \ + sleep.o socket.o timer.o trace.o xprop.o xwrap.o + ++LIB_SHOBJS= ashash.So aslist.So asvector.So audit.So \ ++ fs.So layout.So mystring.So os.So output.So parse.So \ ++ regexp.So safemalloc.So selfdiag.So \ ++ sleep.So socket.So timer.So trace.So xprop.So xwrap.So ++ + # end specifics + ################################################################ + # generic makefile stuff : +@@ -54,7 +59,7 @@ MV = @MV@ RM = @RM@ RMF = @RM@ -f @@ -9,7 +21,7 @@ FIND = @FIND@ XARGS = @XARGS@ LDCONFIG = @LDCONFIG@ -@@ -65,11 +65,11 @@ +@@ -65,11 +70,11 @@ LEXFLAGS = INSTALL = @INSTALL@ @@ -26,7 +38,7 @@ INCS_X = @X_CFLAGS@ INCLUDES = $(INCS_X) $(INCS_PRIVATE) -@@ -113,9 +113,8 @@ +@@ -113,9 +118,8 @@ install.script: install.dyn: @@ -38,7 +50,28 @@ ln -sf $(LIB_SHARED).$(LIBVERMAJOR) $(LIBDIR)/$(LIB_SHARED) @( \ if test `uname` = "Linux"; then \ -@@ -249,11 +248,8 @@ +@@ -225,15 +229,19 @@ + done; \ + echo "" >> .shared ; + +- + $(LIB_STATIC): $(LIB_OBJS) $(LIB_INCS) + $(RMF) $(LIB_STATIC) + $(AR) $(LIB_STATIC) $(LIB_OBJS) + $(RANLIB) $(LIB_STATIC) + ++.SUFFIXES: .s .o .So ++ + .c.o: + $(CC) $(CCFLAGS) $(EXTRA_DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) -c $*.c + ++.c.So: ++ $(CC) $(CCFLAGS) -fPIC $(EXTRA_DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) -c $*.c -o $*.So ++ + .c.s: + $(CC) $(CCFLAGS) $(EXTRA_DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) -S $*.c + +@@ -249,12 +257,9 @@ $(LIB_SHARED): $(LIB_SHARED).$(LIBVERMAJOR) ln -sf $(LIB_SHARED).$(LIBVERMAJOR) $(LIB_SHARED) @@ -47,8 +80,10 @@ - -$(LIB_SHARED).$(LIBVER): $(LIB_OBJS) $(LIB_INCS) - $(CC) -shared -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \ -+$(LIB_SHARED).$(LIBVERMAJOR): $(LIB_OBJS) $(LIB_INCS) +- $(LIB_OBJS) ++$(LIB_SHARED).$(LIBVERMAJOR): $(LIB_SHOBJS) $(LIB_INCS) + $(CC) -shared -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVERMAJOR) \ - $(LIB_OBJS) ++ $(LIB_SHOBJS) install: install.lib + |