diff options
Diffstat (limited to 'sci-libs/libcore/files/libcore-1.7.patch')
| -rw-r--r-- | sci-libs/libcore/files/libcore-1.7.patch | 96 |
1 files changed, 96 insertions, 0 deletions
diff --git a/sci-libs/libcore/files/libcore-1.7.patch b/sci-libs/libcore/files/libcore-1.7.patch new file mode 100644 index 000000000000..dcc2c77ac45b --- /dev/null +++ b/sci-libs/libcore/files/libcore-1.7.patch @@ -0,0 +1,96 @@ +--- src/Makefile 2004-11-11 19:10:53.000000000 +0100 ++++ src/Makefile 2006-10-12 20:25:40.000000000 +0200 +@@ -7,7 +7,7 @@ + + CORE_PATH=.. + +-INCLUDE=-I${CORE_PATH}/inc -I${CORE_PATH}/gmp/include ++INCLUDE=-I${CORE_PATH}/inc + + # VAR indicates variants of the Core library + # E.g., if VAR=(empty) then we compile the release version. +@@ -31,7 +31,8 @@ + + # The following library will be built: + CORE_LIB=$(CORE_PATH)/lib/libcore++${VAR}.a +-CORE_SHARED_LIB=$(CORE_PATH)/lib/libcore++${VAR}.so ++CORE_SHARED_LIB_NAME=libcore++${VAR}.so ++CORE_SHARED_LIB=$(CORE_PATH)/lib/$(CORE_SHARED_LIB_NAME) + + TARGET=$(CORE_LIB) + +@@ -49,7 +50,7 @@ + $(AR) $@ $? + + ${CORE_SHARED_LIB}: $(EXPROBJS) +- $(CXX) $(CORE_LDFLAGS) -o $@ $^ ++ $(CXX) $(LDFLAGS) $(CORE_LDFLAGS) -Wl,-soname,$(CORE_SHARED_LIB_NAME).1 -o $@ $^ + + %${VAR}.o: %.cpp + # Aug 8, 2004 by Chee (TEMP CHANGE! FOR DEBUGGING) +--- ext/Makefile 2004-11-11 19:10:55.000000000 +0100 ++++ ext/Makefile 2006-10-12 20:26:00.000000000 +0200 +@@ -13,7 +13,7 @@ + # ============================================================= + + CORE_PATH=.. +-INCLUDE=-I${CORE_PATH}/inc -I${CORE_PATH}/gmp/include ++INCLUDE=-I${CORE_PATH}/inc + + MODULES := linearAlgebra geometry2d geometry3d + +@@ -29,9 +29,12 @@ + COREX_LIB_LEVEL3=${CORE_PATH}/lib/libcorex++$(VAR)_level3.a + COREX_LIB_LEVEL2=${CORE_PATH}/lib/libcorex++$(VAR)_level2.a + COREX_LIB_LEVEL1=${CORE_PATH}/lib/libcorex++$(VAR)_level1.a +-COREX_SHARED_LIB_LEVEL3=${CORE_PATH}/lib/libcorex++$(VAR)_level3.so +-COREX_SHARED_LIB_LEVEL2=${CORE_PATH}/lib/libcorex++$(VAR)_level2.so +-COREX_SHARED_LIB_LEVEL1=${CORE_PATH}/lib/libcorex++$(VAR)_level1.so ++COREX_SHARED_LIB_LEVEL3_NAME=libcorex++$(VAR)_level3.so ++COREX_SHARED_LIB_LEVEL2_NAME=libcorex++$(VAR)_level2.so ++COREX_SHARED_LIB_LEVEL1_NAME=libcorex++$(VAR)_level1.so ++COREX_SHARED_LIB_LEVEL3=${CORE_PATH}/lib/$(COREX_SHARED_LIB_LEVEL3_NAME) ++COREX_SHARED_LIB_LEVEL2=${CORE_PATH}/lib/$(COREX_SHARED_LIB_LEVEL2_NAME) ++COREX_SHARED_LIB_LEVEL1=${CORE_PATH}/lib/$(COREX_SHARED_LIB_LEVEL1_NAME) + + TARGET=${COREX_LIB_LEVEL3} ${COREX_LIB_LEVEL2} ${COREX_LIB_LEVEL1} + +@@ -59,7 +62,7 @@ + + ${COREX_SHARED_LIB_LEVEL3}: ${L3_OBJS} + -@rm -rf $@ +- $(CXX) $(CORE_LDFLAGS) -o $@ $? ++ $(CXX) $(LDFLAGS) $(CORE_LDFLAGS) -Wl,-soname,$(COREX_SHARED_LIB_LEVEL3_NAME).1 -o $@ $? + + ${COREX_LIB_LEVEL2}: ${L2_OBJS} + -@rm -rf $@ +@@ -67,7 +70,7 @@ + + ${COREX_SHARED_LIB_LEVEL2}: ${L2_OBJS} + -@rm -rf $@ +- $(CXX) $(CORE_LDFLAGS) -o $@ $? ++ $(CXX) $(LDFLAGS) $(CORE_LDFLAGS) -Wl,-soname,$(COREX_SHARED_LIB_LEVEL2_NAME).1 -o $@ $? + + ${COREX_LIB_LEVEL1}: ${L1_OBJS} + -@rm -rf $@ +@@ -75,16 +78,16 @@ + + ${COREX_SHARED_LIB_LEVEL1}: ${L1_OBJS} + -@rm -rf $@ +- $(CXX) $(CORE_LDFLAGS) -o $@ $? ++ $(CXX) $(LDFLAGS) $(CORE_LDFLAGS) -Wl,-soname,$(COREX_SHARED_LIB_LEVEL1_NAME).1 -o $@ $? + + %_level3.o: %.cpp +- ${CXX} $(CORE_CXXFLAGS) -DCORE_LEVEL=3 $(INCLUDE) -c $< -o $@ ++ ${CXX} -ffriend-injection -fpermissive $(CORE_CXXFLAGS) -DCORE_LEVEL=3 $(INCLUDE) -c $< -o $@ + + %_level2.o: %.cpp +- ${CXX} $(CORE_CXXFLAGS) -DCORE_LEVEL=2 $(INCLUDE) -c $< -o $@ ++ ${CXX} -ffriend-injection -fpermissive $(CORE_CXXFLAGS) -DCORE_LEVEL=2 $(INCLUDE) -c $< -o $@ + + %_level1.o: %.cpp +- ${CXX} $(CORE_CXXFLAGS) -DCORE_LEVEL=1 $(INCLUDE) -c $< -o $@ ++ ${CXX} -ffriend-injection -fpermissive $(CORE_CXXFLAGS) -DCORE_LEVEL=1 $(INCLUDE) -c $< -o $@ + + clean: + -@test -z "*.o" || rm -f *.o |