| 1 |
jlec 10/04/03 22:26:28 |
| 2 |
|
| 3 |
Added: glimmer-3.02-jobserver-fix.patch |
| 4 |
glimmer-3.02-ldflags.patch |
| 5 |
Log: |
| 6 |
jobserver fix, #299482, Thanks Myckel Habets |
| 7 |
LDFLAGS/CFLAGS etc repected |
| 8 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 sci-biology/glimmer/files/glimmer-3.02-jobserver-fix.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-biology/glimmer/files/glimmer-3.02-jobserver-fix.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-biology/glimmer/files/glimmer-3.02-jobserver-fix.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: glimmer-3.02-jobserver-fix.patch |
| 17 |
=================================================================== |
| 18 |
diff -ru glimmer3.02-orig/src/Makefile glimmer3.02/src/Makefile |
| 19 |
--- glimmer3.02-orig/src/Makefile 2006-06-12 21:40:14.000000000 +0200 |
| 20 |
+++ glimmer3.02/src/Makefile 2010-03-18 14:30:15.000000000 +0100 |
| 21 |
@@ -2,12 +2,12 @@ |
| 22 |
|
| 23 |
|
| 24 |
all: |
| 25 |
- @ TGT=objs |
| 26 |
- @ $(dosubdirs) |
| 27 |
- @ TGT=libs |
| 28 |
- @ $(dosubdirs) |
| 29 |
- @ TGT=progs |
| 30 |
- @ $(dosubdirs) |
| 31 |
+ @+ TGT=objs |
| 32 |
+ @+ $(dosubdirs) |
| 33 |
+ @+ TGT=libs |
| 34 |
+ @+ $(dosubdirs) |
| 35 |
+ @+ TGT=progs |
| 36 |
+ @+ $(dosubdirs) |
| 37 |
|
| 38 |
|
| 39 |
install: all |
| 40 |
|
| 41 |
|
| 42 |
|
| 43 |
1.1 sci-biology/glimmer/files/glimmer-3.02-ldflags.patch |
| 44 |
|
| 45 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-biology/glimmer/files/glimmer-3.02-ldflags.patch?rev=1.1&view=markup |
| 46 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-biology/glimmer/files/glimmer-3.02-ldflags.patch?rev=1.1&content-type=text/plain |
| 47 |
|
| 48 |
Index: glimmer-3.02-ldflags.patch |
| 49 |
=================================================================== |
| 50 |
diff --git a/src/c_make.gen b/src/c_make.gen |
| 51 |
index 414dead..84c3030 100644 |
| 52 |
--- a/src/c_make.gen |
| 53 |
+++ b/src/c_make.gen |
| 54 |
@@ -200,45 +200,12 @@ LOCAL_SYS_INC=$(SEP_PATH)/../SYS/inc |
| 55 |
#### Do not redefine if (a) passed in on command line, or (b) |
| 56 |
#### defined in an environment variable. |
| 57 |
|
| 58 |
-ifneq "$(origin CC)" "environment" |
| 59 |
-CC = cc |
| 60 |
-endif |
| 61 |
- |
| 62 |
-ifneq "$(origin CPPFLAGS)" "environment" |
| 63 |
-CPPFLAGS= |
| 64 |
-endif |
| 65 |
- |
| 66 |
-ifneq "$(origin CFLAGS)" "environment" |
| 67 |
-CFLAGS = |
| 68 |
-endif |
| 69 |
- |
| 70 |
-ifneq "$(origin CDEFS)" "environment" |
| 71 |
-CDEFS = |
| 72 |
-endif |
| 73 |
- |
| 74 |
-ifneq "$(origin CXX)" "environment" |
| 75 |
-CXX = g++ |
| 76 |
-endif |
| 77 |
- |
| 78 |
-ifneq "$(origin CXXFLAGS)" "environment" |
| 79 |
-CXXFLAGS= |
| 80 |
-endif |
| 81 |
- |
| 82 |
-ifneq "$(origin CXXDEFS)" "environment" |
| 83 |
-CXXDEFS= -D__cplusplus |
| 84 |
-endif |
| 85 |
- |
| 86 |
-ifneq "$(origin AR)" "environment" |
| 87 |
-AR = ar |
| 88 |
-endif |
| 89 |
- |
| 90 |
-ifneq "$(origin ARFLAGS)" "environment" |
| 91 |
-ARFLAGS = rvs |
| 92 |
-endif |
| 93 |
- |
| 94 |
-ifneq "$(origin LDFLAGS)" "environment" |
| 95 |
-LDFLAGS = |
| 96 |
-endif |
| 97 |
+CC ?= cc |
| 98 |
+CXX ?= g++ |
| 99 |
+CXXFLAGS ?= |
| 100 |
+CXXDEFS = -D__cplusplus |
| 101 |
+AR ?= ar |
| 102 |
+ARFLAGS ?= rvs |
| 103 |
|
| 104 |
#### Delete default suffix rules |
| 105 |
.SUFFIXES: |
| 106 |
@@ -359,13 +326,13 @@ $(PROGS): |
| 107 |
cd $(LOCAL_OBJ); \ |
| 108 |
if $(CC) -o $(LOCAL_BIN)/$(notdir $@) $(LDFLAGS) \ |
| 109 |
$(LD_DIRS) $(filter-out lib%.a, $+) \ |
| 110 |
- $(patsubst lib%.a, -l%, $(filter lib%.a, $+)) ; then \ |
| 111 |
+ $(patsubst lib%.a, -l%, $(filter lib%.a, $+)) $(LIBS) ; then \ |
| 112 |
true; else rm -f $(LOCAL_BIN)/$(notdir $@); fi; \ |
| 113 |
else \ |
| 114 |
cd $(LOCAL_OBJ); \ |
| 115 |
if $(CXX) -o $(LOCAL_BIN)/$(notdir $@) $(LDFLAGS) \ |
| 116 |
$(LD_DIRS) $(filter-out lib%.a, $+) \ |
| 117 |
- $(patsubst lib%.a, -l%, $(filter lib%.a, $+)) ; then \ |
| 118 |
+ $(patsubst lib%.a, -l%, $(filter lib%.a, $+)) $(LIBS) ; then \ |
| 119 |
true; else rm -f $(LOCAL_BIN)/$(notdir $@); fi; \ |
| 120 |
fi ; |
| 121 |
|
| 122 |
diff --git a/src/c_make.glm b/src/c_make.glm |
| 123 |
index 0decc17..b82131c 100644 |
| 124 |
--- a/src/c_make.glm |
| 125 |
+++ b/src/c_make.glm |
| 126 |
@@ -8,10 +8,7 @@ include $(LOCAL_WORK)/src/c_make.gen |
| 127 |
|
| 128 |
SUBDIRS = Common ICM Glimmer Util |
| 129 |
|
| 130 |
-CFLAGS = -g -Wall |
| 131 |
-CXXFLAGS = -g -Wall |
| 132 |
- |
| 133 |
-LDFLAGS = -g -lm |
| 134 |
+LIBS = -lm |
| 135 |
|
| 136 |
|
| 137 |
#AS_BUILD_DIR =$(LOCAL_WORK) |
Archives