/[gentoo-x86]/sci-libs/libcore/files/2.1.1-makefiles.patch
Gentoo

Contents of /sci-libs/libcore/files/2.1.1-makefiles.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (hide annotations) (download) (as text)
Sun Aug 7 00:03:25 2011 UTC (8 years, 7 months ago) by bicatali
Branch: MAIN
CVS Tags: HEAD
File MIME type: text/x-diff
Version bump, switch to EAPI4, updated makefile patch

(Portage version: 2.1.10.10/cvs/Linux x86_64)

1 bicatali 1.1 diff -Nur core-2.1.1.orig/ext/Makefile core-2.1.1/ext/Makefile
2     --- core-2.1.1.orig/ext/Makefile 2011-08-06 22:53:29.000000000 +0100
3     +++ core-2.1.1/ext/Makefile 2011-08-07 00:40:58.000000000 +0100
4     @@ -38,16 +38,18 @@
5     endif
6     endif
7    
8     -INCLUDE=-I${CORE_PATH}/inc -I${CORE_PATH}/gmp/include \
9     - -I${CORE_PATH}/mpfr/include
10     +INCLUDE=-I${CORE_PATH}/inc
11    
12    
13     COREX_LIB_LEVEL3=${CORE_PATH}/lib/libcorex++$(VAR)_level3.a
14     COREX_LIB_LEVEL2=${CORE_PATH}/lib/libcorex++$(VAR)_level2.a
15     COREX_LIB_LEVEL1=${CORE_PATH}/lib/libcorex++$(VAR)_level1.a
16     -COREX_SHARED_LIB_LEVEL3=${CORE_PATH}/lib/libcorex++$(VAR)_level3.${CORE_DYLIB_EXTENSION}
17     -COREX_SHARED_LIB_LEVEL2=${CORE_PATH}/lib/libcorex++$(VAR)_level2.${CORE_DYLIB_EXTENSION}
18     -COREX_SHARED_LIB_LEVEL1=${CORE_PATH}/lib/libcorex++$(VAR)_level1.${CORE_DYLIB_EXTENSION}
19     +COREX_SHARED_LIB_LEVEL3_NAME=libcorex++$(VAR)_level3.${CORE_DYLIB_EXTENSION}.2
20     +COREX_SHARED_LIB_LEVEL2_NAME=libcorex++$(VAR)_level2.${CORE_DYLIB_EXTENSION}.2
21     +COREX_SHARED_LIB_LEVEL1_NAME=libcorex++$(VAR)_level1.${CORE_DYLIB_EXTENSION}.2
22     +COREX_SHARED_LIB_LEVEL3=${CORE_PATH}/lib/$(COREX_SHARED_LIB_LEVEL3_NAME)
23     +COREX_SHARED_LIB_LEVEL2=${CORE_PATH}/lib/$(COREX_SHARED_LIB_LEVEL2_NAME)
24     +COREX_SHARED_LIB_LEVEL1=${CORE_PATH}/lib/$(COREX_SHARED_LIB_LEVEL1_NAME)
25    
26     TARGET=${COREX_LIB_LEVEL3} ${COREX_LIB_LEVEL2} ${COREX_LIB_LEVEL1}
27    
28     @@ -74,11 +76,11 @@
29     -@rm -rf $@
30     $(AR) $@ $?
31    
32     -COREX_SHARED_DEPS=-L${GMP_PREFIX}/lib -lgmp -L${MPFR_PREFIX}/lib -lmpfr -L${CORE_PATH}/lib -lcore++${VAR}
33     +COREX_SHARED_DEPS= -lgmp -lmpfr -L${CORE_PATH}/lib -lcore++${VAR}
34    
35     ${COREX_SHARED_LIB_LEVEL3}: ${L3_OBJS}
36     -@rm -rf $@
37     - $(CXX) $(COREX_SHARED_DEPS) $(CORE_LDFLAGS) -o $@ $?
38     + $(CXX) $(LDFLAGS) $(COREX_SHARED_DEPS) $(CORE_LDFLAGS) -Wl,-soname,$(COREX_SHARED_LIB_LEVEL3_NAME) -o $@ $?
39    
40     ${COREX_LIB_LEVEL2}: ${L2_OBJS}
41     -@rm -rf $@
42     @@ -86,7 +88,7 @@
43    
44     ${COREX_SHARED_LIB_LEVEL2}: ${L2_OBJS}
45     -@rm -rf $@
46     - $(CXX) $(COREX_SHARED_DEPS) $(CORE_LDFLAGS) -o $@ $?
47     + $(CXX) $(LDFLAGS) $(COREX_SHARED_DEPS) $(CORE_LDFLAGS) -Wl,-soname,$(COREX_SHARED_LIB_LEVEL2_NAME) -o $@ $?
48    
49     ${COREX_LIB_LEVEL1}: ${L1_OBJS}
50     -@rm -rf $@
51     @@ -94,7 +96,7 @@
52    
53     ${COREX_SHARED_LIB_LEVEL1}: ${L1_OBJS}
54     -@rm -rf $@
55     - $(CXX) $(COREX_SHARED_DEPS) $(CORE_LDFLAGS) -o $@ $?
56     + $(CXX) $(LDFLAGS) $(COREX_SHARED_DEPS) $(CORE_LDFLAGS) -Wl,-soname,$(COREX_SHARED_LIB_LEVEL1_NAME) -o $@ $?
57    
58     %_level3.o: %.cpp
59     ${CXX} $(CORE_CXXFLAGS) -DCORE_LEVEL=3 $(INCLUDE) -c $< -o $@
60     diff -Nur core-2.1.1.orig/progs/Make.options core-2.1.1/progs/Make.options
61     --- core-2.1.1.orig/progs/Make.options 2011-08-06 22:53:29.000000000 +0100
62     +++ core-2.1.1/progs/Make.options 2011-08-06 23:31:01.000000000 +0100
63     @@ -11,10 +11,8 @@
64    
65     include $(CORE_PATH)/Make.config
66    
67     -CORE_INC=-I. -I$(CORE_PATH)/inc -I$(CORE_PATH)/mpfr/include \
68     - -I$(CORE_PATH)/gmp/include
69     -CORE_LIB=-L$(CORE_PATH)/lib -L$(CORE_PATH)/mpfr/lib -L$(CORE_PATH)/gmp/lib \
70     - -lcore++$(VAR) -lmpfr -lgmp
71     +CORE_INC=-I. -I$(CORE_PATH)/inc
72     +CORE_LIB=-L$(CORE_PATH)/lib -lcore++$(VAR) -lmpfr -lgmp
73    
74     COREX_LIB_LEVEL=-lcoreex++$(VAR)_level
75    
76     diff -Nur core-2.1.1.orig/src/Makefile core-2.1.1/src/Makefile
77     --- core-2.1.1.orig/src/Makefile 2011-08-06 22:53:29.000000000 +0100
78     +++ core-2.1.1/src/Makefile 2011-08-07 00:24:38.000000000 +0100
79     @@ -23,7 +23,7 @@
80     endif
81     endif
82    
83     -INCLUDE=-I${CORE_PATH}/inc -I${CORE_PATH}/mpfr/include -I${CORE_PATH}/gmp/include
84     +INCLUDE=-I${CORE_PATH}/inc
85    
86     # VAR indicates variants of the Core library
87     # E.g., if VAR=(empty) then we compile the release version.
88     @@ -44,7 +44,8 @@
89    
90     # The following library will be built:
91     CORE_LIB=$(CORE_PATH)/lib/libcore++${VAR}.a
92     -CORE_SHARED_LIB=$(CORE_PATH)/lib/libcore++${VAR}.${CORE_DYLIB_EXTENSION}
93     +CORE_SHARED_LIB_NAME=libcore++${VAR}.${CORE_DYLIB_EXTENSION}.2
94     +CORE_SHARED_LIB=$(CORE_PATH)/lib/$(CORE_SHARED_LIB_NAME)
95    
96     TARGET=$(CORE_LIB)
97    
98     @@ -52,7 +53,7 @@
99     TARGET+=$(CORE_SHARED_LIB)
100     endif
101    
102     -DEPS=-L${GMP_PREFIX}/lib -L${MPFR_PREFIX}/lib -lgmp -lmpfr
103     +DEPS=-lgmp -lmpfr
104    
105     # =============================================================
106     # RULES ======================================================
107     @@ -64,7 +65,7 @@
108     $(AR) $@ $^
109    
110     ${CORE_SHARED_LIB}: $(EXPROBJS)
111     - $(CXX) $(DEPS) $(CORE_LDFLAGS) -o $@ $^
112     + $(CXX) $(LDFLAGS) $(CORE_LDFLAGS) -Wl,-soname,$(CORE_SHARED_LIB_NAME) $(DEPS) -o $@ $^ $(LIBS)
113    
114     %${VAR}.o: %.cpp
115     ${CXX} $(CORE_CXXFLAGS) $(INCLUDE) -c $< -o $@

  ViewVC Help
Powered by ViewVC 1.1.20