commit: cce4991b1c1b2f8a8ec9ebbe16608db0ebe2041c Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Tue Jan 31 18:14:25 2017 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Wed Feb 1 22:40:06 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cce4991b
sci-libs/libcore: remove unused patches Closes: https://github.com/gentoo/gentoo/pull/3742 sci-libs/libcore/files/libcore-1.7.patch | 96 --------------------- .../libcore/files/libcore-2.0.8-makefiles.patch | 97 ---------------------- 2 files changed, 193 deletions(-) diff --git a/sci-libs/libcore/files/libcore-1.7.patch b/sci-libs/libcore/files/libcore-1.7.patch deleted file mode 100644 index dcc2c77..00000000 --- a/sci-libs/libcore/files/libcore-1.7.patch +++ /dev/null @@ -1,96 +0,0 @@ ---- 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 diff --git a/sci-libs/libcore/files/libcore-2.0.8-makefiles.patch b/sci-libs/libcore/files/libcore-2.0.8-makefiles.patch deleted file mode 100644 index 6980332..00000000 --- a/sci-libs/libcore/files/libcore-2.0.8-makefiles.patch +++ /dev/null @@ -1,97 +0,0 @@ ---- src/Makefile.orig 2009-08-12 22:52:51.000000000 +0100 -+++ src/Makefile 2009-08-12 23:38:51.000000000 +0100 -@@ -7,7 +7,7 @@ - - CORE_PATH=.. - --INCLUDE=-I${CORE_PATH}/inc -I${CORE_PATH}/mpfr/include -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. -@@ -37,12 +37,13 @@ - - # 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.2.0.0 -+CORE_SHARED_LIB=$(CORE_PATH)/lib/$(CORE_SHARED_LIB_NAME) - - TARGET=$(CORE_LIB) - - ifeq (${LINKAGE}, shared) -- TARGET+=$(CORE_SHARED_LIB) -+ TARGET=$(CORE_SHARED_LIB) - endif - - # ============================================================= -@@ -55,7 +56,7 @@ - $(AR) $@ $^ - - ${CORE_SHARED_LIB}: $(EXPROBJS) -- $(CXX) $(CORE_LDFLAGS) -o $@ $^ -+ $(CXX) $(LDFLAGS) $(CORE_LDFLAGS) -Wl,-soname,$(CORE_SHARED_LIB_NAME).2.0.0 -o $@ $^ $(LIBS) - - %${VAR}.o: %.cpp - ${CXX} $(CORE_CXXFLAGS) $(INCLUDE) -c $< -o $@ ---- ext/Makefile.orig 2009-08-12 22:54:55.000000000 +0100 -+++ ext/Makefile 2009-08-12 23:39:19.000000000 +0100 -@@ -13,8 +13,7 @@ - # ============================================================= - - CORE_PATH=.. --INCLUDE=-I${CORE_PATH}/inc -I${CORE_PATH}/gmp/include \ -- -I${CORE_PATH}/mpfr/include -+INCLUDE=-I${CORE_PATH}/inc - - MODULES := linearAlgebra geometry2d geometry3d - -@@ -30,14 +29,17 @@ - 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.2.0.0 -+COREX_SHARED_LIB_LEVEL2_NAME=libcorex++$(VAR)_level2.so.2.0.0 -+COREX_SHARED_LIB_LEVEL1_NAME=libcorex++$(VAR)_level1.so.2.0.0 -+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} - - ifeq (${LINKAGE}, shared) -- TARGET += $(COREX_SHARED_LIB_LEVEL3) $(COREX_SHARED_LIB_LEVEL2) \ -+ TARGET = $(COREX_SHARED_LIB_LEVEL3) $(COREX_SHARED_LIB_LEVEL2) \ - $(COREX_SHARED_LIB_LEVEL1) - endif - -@@ -60,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).2.0.0 -o $@ $? - - ${COREX_LIB_LEVEL2}: ${L2_OBJS} - -@rm -rf $@ -@@ -68,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).2.0.0 -o $@ $? - - ${COREX_LIB_LEVEL1}: ${L1_OBJS} - -@rm -rf $@ -@@ -76,7 +78,7 @@ - - ${COREX_SHARED_LIB_LEVEL1}: ${L1_OBJS} - -@rm -rf $@ -- $(CXX) $(CORE_LDFLAGS) -o $@ $? -+ $(CXX) $(LDFLAGS) $(CORE_LDFLAGS) -Wl,-soname,$(COREX_SHARED_LIB_LEVEL1_NAME).2.0.0 -o $@ $? - - %_level3.o: %.cpp - ${CXX} $(CORE_CXXFLAGS) -DCORE_LEVEL=3 $(INCLUDE) -c $< -o $@
