kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Better fix for amd64: don't pessimize the lib.a by compiling the object

Browse source 
files with -fPIC; instead, build them twice with and without -fPIC.
This commit is contained in:
Kris Kennaway 2004-03-15 07:57:49 +00:00
parent ed35f851d1
commit 3547b5112e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=104054
2 changed files with 43 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
devel/libafterbase/Makefile
View file

@ -19,7 +19,6 @@ COMMENT= AfterStep basic functionality library
USE_REINPLACE= yes USE_REINPLACE= yes
USE_X_PREFIX= yes USE_X_PREFIX= yes
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
CONFIGURE_ENV= CFLAGS="${CFLAGS} -fPIC"
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --enable-sharedlibs --with-x CONFIGURE_ARGS= --enable-sharedlibs --with-x
INSTALLS_SHLIB= yes INSTALLS_SHLIB= yes

51
devel/libafterbase/files/patch-Makefile.in
View file

@ -1,6 +1,18 @@
--- Makefile.in.orig Wed Dec 19 06:54:34 2001 --- Makefile.in.orig Tue Jan 15 12:53:17 2002
+++ Makefile.in Sat Jan 12 02:43:00 2002 +++ Makefile.in Sun Mar 14 23:56:38 2004
@@ -54,7 +54,7 @@ @@ -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@ MV = @MV@
RM = @RM@ RM = @RM@
RMF = @RM@ -f RMF = @RM@ -f
@ -9,7 +21,7 @@
FIND = @FIND@ FIND = @FIND@
XARGS = @XARGS@ XARGS = @XARGS@
LDCONFIG = @LDCONFIG@ LDCONFIG = @LDCONFIG@
@@ -65,11 +65,11 @@ @@ -65,11 +70,11 @@
LEXFLAGS = LEXFLAGS =
INSTALL = @INSTALL@ INSTALL = @INSTALL@
@ -26,7 +38,7 @@
INCS_X = @X_CFLAGS@ INCS_X = @X_CFLAGS@
INCLUDES = $(INCS_X) $(INCS_PRIVATE) INCLUDES = $(INCS_X) $(INCS_PRIVATE)
@@ -113,9 +113,8 @@ @@ -113,9 +118,8 @@
install.script: install.script:
install.dyn: install.dyn:
@ -38,7 +50,28 @@
ln -sf $(LIB_SHARED).$(LIBVERMAJOR) $(LIBDIR)/$(LIB_SHARED) ln -sf $(LIB_SHARED).$(LIBVERMAJOR) $(LIBDIR)/$(LIB_SHARED)
@( \ @( \
if test `uname` = "Linux"; then \ 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) $(LIB_SHARED): $(LIB_SHARED).$(LIBVERMAJOR)
ln -sf $(LIB_SHARED).$(LIBVERMAJOR) $(LIB_SHARED) ln -sf $(LIB_SHARED).$(LIBVERMAJOR) $(LIB_SHARED)
@ -47,8 +80,10 @@
- -
-$(LIB_SHARED).$(LIBVER): $(LIB_OBJS) $(LIB_INCS) -$(LIB_SHARED).$(LIBVER): $(LIB_OBJS) $(LIB_INCS)
- $(CC) -shared -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \ - $(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) \ + $(CC) -shared -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVERMAJOR) \
$(LIB_OBJS) + $(LIB_SHOBJS)
install: install.lib install: install.lib