mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-21 20:38:45 +00:00
Better fix for amd64 (don't pessimize lib.a by compiling objects with -fPIC)
This commit is contained in:
Kris Kennaway
parent
38272dc40d
commit
f067b4d9c0
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=104124
@ -25,10 +25,6 @@ NO_FILTER_SHLIBS=yes
|
||||
PLIST_SUB+= SHLIB_VERSION=${SHLIB_VERSION}
|
||||
SHLIB_VERSION= 0
|
||||
|
||||
.if ${MACHINE_ARCH:L} == amd64
|
||||
CFLAGS+= -fPIC
|
||||
.endif
|
||||
|
||||
pre-everything::
|
||||
.if !defined(WITH_PATESTS)
|
||||
@${ECHO_MSG}
|
||||
|
||||
48
audio/portaudio/files/patch-Makefile.in
Normal file
48
audio/portaudio/files/patch-Makefile.in
Normal file
@ -0,0 +1,48 @@
|
||||
--- Makefile.in.orig Mon Mar 15 15:51:08 2004
|
||||
+++ Makefile.in Mon Mar 15 15:51:59 2004
|
||||
@@ -15,6 +15,7 @@
|
||||
DLL_LIBS = @DLL_LIBS@
|
||||
|
||||
OTHER_OBJS = @OTHER_OBJS@
|
||||
+OTHER_SHOBJS = @OTHER_SHOBJS@
|
||||
|
||||
PALIB = libportaudio.a
|
||||
PADLL = @PADLL@
|
||||
@@ -25,6 +26,10 @@
|
||||
pa_common/pa_convert.o \
|
||||
pa_common/pa_lib.o
|
||||
|
||||
+COMMON_SHOBJS = \
|
||||
+ pa_common/pa_convert.So \
|
||||
+ pa_common/pa_lib.So
|
||||
+
|
||||
TESTS = \
|
||||
bin/patest_buffer \
|
||||
bin/patest_clip \
|
||||
@@ -50,8 +55,15 @@
|
||||
bin/patest_underflow \
|
||||
bin/patest_wire
|
||||
|
||||
+.SUFFIXES: .o .So
|
||||
+
|
||||
+.c.So:
|
||||
+ $(CC) $(CFLAGS) -fPIC -o $*.So -c $?
|
||||
+
|
||||
OBJS = $(COMMON_OBJS) $(OTHER_OBJS)
|
||||
|
||||
+SHOBJS = $(COMMON_SHOBJS) $(OTHER_SHOBJS)
|
||||
+
|
||||
all: lib/$(PALIB) lib/$(PADLLV) tests
|
||||
|
||||
tests: bin/ $(TESTS)
|
||||
@@ -60,8 +72,8 @@
|
||||
$(AR) ruv lib/$(PALIB) $(OBJS)
|
||||
$(RANLIB) lib/$(PALIB)
|
||||
|
||||
-lib/$(PADLLV): lib/ $(OBJS) Makefile $(PAINC)
|
||||
- $(CC) $(SHARED_FLAGS) -o lib/$(PADLLV) $(OBJS) $(DLL_LIBS)
|
||||
+lib/$(PADLLV): lib/ $(SHOBJS) Makefile $(PAINC)
|
||||
+ $(CC) $(SHARED_FLAGS) -o lib/$(PADLLV) $(SHOBJS) $(DLL_LIBS)
|
||||
|
||||
$(TESTS): bin/%: lib/$(PALIB) Makefile $(PAINC) pa_tests/%.c
|
||||
$(CC) -o $@ $(CFLAGS) pa_tests/$*.c lib/$(PALIB) $(LIBS)
|
||||
18
audio/portaudio/files/patch-configure
Normal file
18
audio/portaudio/files/patch-configure
Normal file
@ -0,0 +1,18 @@
|
||||
--- configure.orig Mon Mar 15 15:52:38 2004
|
||||
+++ configure Mon Mar 15 15:53:00 2004
|
||||
@@ -1972,6 +1972,7 @@
|
||||
fi
|
||||
|
||||
OTHER_OBJS="pa_unix_oss/pa_unix_oss.o pa_unix_oss/pa_unix.o";
|
||||
+ OTHER_SHOBJS="pa_unix_oss/pa_unix_oss.So pa_unix_oss/pa_unix.So";
|
||||
LIBS="-lm -lpthread";
|
||||
PADLL="libportaudio.so";
|
||||
SHARED_FLAGS="-shared";
|
||||
@@ -2404,6 +2405,7 @@
|
||||
s,@INSTALL_DATA@,$INSTALL_DATA,;t t
|
||||
s,@AR@,$AR,;t t
|
||||
s,@OTHER_OBJS@,$OTHER_OBJS,;t t
|
||||
+s,@OTHER_SHOBJS@,$OTHER_SHOBJS,;t t
|
||||
s,@PADLL@,$PADLL,;t t
|
||||
s,@SHARED_FLAGS@,$SHARED_FLAGS,;t t
|
||||
s,@DLL_LIBS@,$DLL_LIBS,;t t
|
||||
@ -25,10 +25,6 @@ NO_FILTER_SHLIBS=yes
|
||||
PLIST_SUB+= SHLIB_VERSION=${SHLIB_VERSION}
|
||||
SHLIB_VERSION= 0
|
||||
|
||||
.if ${MACHINE_ARCH:L} == amd64
|
||||
CFLAGS+= -fPIC
|
||||
.endif
|
||||
|
||||
pre-everything::
|
||||
.if !defined(WITH_PATESTS)
|
||||
@${ECHO_MSG}
|
||||
|
||||
48
audio/portaudio2/files/patch-Makefile.in
Normal file
48
audio/portaudio2/files/patch-Makefile.in
Normal file
@ -0,0 +1,48 @@
|
||||
--- Makefile.in.orig Mon Mar 15 15:51:08 2004
|
||||
+++ Makefile.in Mon Mar 15 15:51:59 2004
|
||||
@@ -15,6 +15,7 @@
|
||||
DLL_LIBS = @DLL_LIBS@
|
||||
|
||||
OTHER_OBJS = @OTHER_OBJS@
|
||||
+OTHER_SHOBJS = @OTHER_SHOBJS@
|
||||
|
||||
PALIB = libportaudio.a
|
||||
PADLL = @PADLL@
|
||||
@@ -25,6 +26,10 @@
|
||||
pa_common/pa_convert.o \
|
||||
pa_common/pa_lib.o
|
||||
|
||||
+COMMON_SHOBJS = \
|
||||
+ pa_common/pa_convert.So \
|
||||
+ pa_common/pa_lib.So
|
||||
+
|
||||
TESTS = \
|
||||
bin/patest_buffer \
|
||||
bin/patest_clip \
|
||||
@@ -50,8 +55,15 @@
|
||||
bin/patest_underflow \
|
||||
bin/patest_wire
|
||||
|
||||
+.SUFFIXES: .o .So
|
||||
+
|
||||
+.c.So:
|
||||
+ $(CC) $(CFLAGS) -fPIC -o $*.So -c $?
|
||||
+
|
||||
OBJS = $(COMMON_OBJS) $(OTHER_OBJS)
|
||||
|
||||
+SHOBJS = $(COMMON_SHOBJS) $(OTHER_SHOBJS)
|
||||
+
|
||||
all: lib/$(PALIB) lib/$(PADLLV) tests
|
||||
|
||||
tests: bin/ $(TESTS)
|
||||
@@ -60,8 +72,8 @@
|
||||
$(AR) ruv lib/$(PALIB) $(OBJS)
|
||||
$(RANLIB) lib/$(PALIB)
|
||||
|
||||
-lib/$(PADLLV): lib/ $(OBJS) Makefile $(PAINC)
|
||||
- $(CC) $(SHARED_FLAGS) -o lib/$(PADLLV) $(OBJS) $(DLL_LIBS)
|
||||
+lib/$(PADLLV): lib/ $(SHOBJS) Makefile $(PAINC)
|
||||
+ $(CC) $(SHARED_FLAGS) -o lib/$(PADLLV) $(SHOBJS) $(DLL_LIBS)
|
||||
|
||||
$(TESTS): bin/%: lib/$(PALIB) Makefile $(PAINC) pa_tests/%.c
|
||||
$(CC) -o $@ $(CFLAGS) pa_tests/$*.c lib/$(PALIB) $(LIBS)
|
||||
18
audio/portaudio2/files/patch-configure
Normal file
18
audio/portaudio2/files/patch-configure
Normal file
@ -0,0 +1,18 @@
|
||||
--- configure.orig Mon Mar 15 15:52:38 2004
|
||||
+++ configure Mon Mar 15 15:53:00 2004
|
||||
@@ -1972,6 +1972,7 @@
|
||||
fi
|
||||
|
||||
OTHER_OBJS="pa_unix_oss/pa_unix_oss.o pa_unix_oss/pa_unix.o";
|
||||
+ OTHER_SHOBJS="pa_unix_oss/pa_unix_oss.So pa_unix_oss/pa_unix.So";
|
||||
LIBS="-lm -lpthread";
|
||||
PADLL="libportaudio.so";
|
||||
SHARED_FLAGS="-shared";
|
||||
@@ -2404,6 +2405,7 @@
|
||||
s,@INSTALL_DATA@,$INSTALL_DATA,;t t
|
||||
s,@AR@,$AR,;t t
|
||||
s,@OTHER_OBJS@,$OTHER_OBJS,;t t
|
||||
+s,@OTHER_SHOBJS@,$OTHER_SHOBJS,;t t
|
||||
s,@PADLL@,$PADLL,;t t
|
||||
s,@SHARED_FLAGS@,$SHARED_FLAGS,;t t
|
||||
s,@DLL_LIBS@,$DLL_LIBS,;t t
|
||||
Loading…
Reference in New Issue
Block a user