1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204
|
Description: propagate build flags via environment variables.
Author: Étienne Mollier <emollier@debian.org>
Bug-Debian: https://bugs.debian.org/1119545
Forwarded: no
Last-Update: 2025-12-07
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- raster3d.orig/Makefile
+++ raster3d/Makefile
@@ -53,24 +53,24 @@
@cp Makefile.template Makefile.incl
@echo OS = linux >> Makefile.incl
@echo CC = gcc >> Makefile.incl
- @echo CFLAGS = -g -O2 -Wall -Dgfortran >> Makefile.incl
+ @echo CFLAGS += -g -O2 -Wall -Dgfortran >> Makefile.incl
@echo FC = gfortran -std=legacy >> Makefile.incl
- @echo FFLAGS = -g -w -O2 -Wno-tabs -ffixed-line-length-132 >> Makefile.incl
+ @echo FFLAGS += -g -w -O2 -Wno-tabs -ffixed-line-length-132 >> Makefile.incl
@echo RM = /bin/rm -f >> Makefile.incl
@echo OSDEFS = -DLINUX -DNETWORKBYTEORDER >> Makefile.incl
@echo include Makefile.package >> Makefile.incl
@echo >> Makefile.incl
@echo qinp.o: qinp.f normal3d.o >> Makefile.incl
- @echo " \$$(FC) -g -O0 -Wall -Wno-tabs -c -o qinp.o qinp.f" >> Makefile.incl
+ @echo " \$$(FC) \$$(FFLAGS) -g -O0 -Wall -Wno-tabs -c -o qinp.o qinp.f" >> Makefile.incl
@echo >> Makefile.incl
linux-ifort:
@cp Makefile.template Makefile.incl
@echo OS = linux >> Makefile.incl
@echo CC = gcc >> Makefile.incl
- @echo CFLAGS = -g -Wall >> Makefile.incl
+ @echo CFLAGS += -g -Wall >> Makefile.incl
@echo FC = ifort >> Makefile.incl
- @echo FFLAGS = -g -w -O3 -132 -static-intel >> Makefile.incl
+ @echo FFLAGS += -g -w -O3 -132 -static-intel >> Makefile.incl
@echo RM = /bin/rm -f >> Makefile.incl
@echo OSDEFS = -DLINUX -DNETWORKBYTEORDER >> Makefile.incl
@echo include Makefile.package >> Makefile.incl
@@ -79,9 +79,9 @@
@cp Makefile.template Makefile.incl
@echo OS = linux-pgf77 >> Makefile.incl
@echo CC = gcc >> Makefile.incl
- @echo CFLAGS = -g -m486 -w >> Makefile.incl
+ @echo CFLAGS += -g -m486 -w >> Makefile.incl
@echo FC = pgf77 >> Makefile.incl
- @echo FFLAGS = -O -Munroll >> Makefile.incl
+ @echo FFLAGS += -O -Munroll >> Makefile.incl
@echo RM = /bin/rm -f >> Makefile.incl
@echo OSDEFS = -DLINUX -DNETWORKBYTEORDER >> Makefile.incl
@echo include Makefile.package >> Makefile.incl
@@ -90,15 +90,15 @@
@cp Makefile.template Makefile.incl
@echo OS = osx >> Makefile.incl
@echo CC = icc >> Makefile.incl
- @echo CFLAGS = -g -Wall >> Makefile.incl
+ @echo CFLAGS += -g -Wall >> Makefile.incl
@echo FC = ifort >> Makefile.incl
- @echo FFLAGS = -g -w -O3 -132 >> Makefile.incl
+ @echo FFLAGS += -g -w -O3 -132 >> Makefile.incl
@echo RM = /bin/rm -f >> Makefile.incl
@echo OSDEFS = -DOSX -DNETWORKBYTEORDER >> Makefile.incl
@echo include Makefile.package >> Makefile.incl
@echo >> Makefile.incl
@echo qinp.o: qinp.f normal3d.o >> Makefile.incl
- @echo " \$$(FC) -g -O0 -w -132 -c -o qinp.o qinp.f" >> Makefile.incl
+ @echo " \$$(FC) \$$(FFLAGS) -g -O0 -w -132 -c -o qinp.o qinp.f" >> Makefile.incl
@echo >> Makefile.incl
osx-fink:
@@ -109,15 +109,15 @@
@echo CC = /sw/bin/gcc-4 >> Makefile.incl
@echo INCDIRS = -I/sw/include >> Makefile.incl
@echo LIBDIRS = -L/sw/lib >> Makefile.incl
- @echo CFLAGS = -g -Wall -Dgfortran >> Makefile.incl
+ @echo CFLAGS += -g -Wall -Dgfortran >> Makefile.incl
@echo FC = /sw/bin/gfortran >> Makefile.incl
- @echo FFLAGS = -g -w -O3 -Wno-tabs -ffixed-line-length-132 >> Makefile.incl
+ @echo FFLAGS += -g -w -O3 -Wno-tabs -ffixed-line-length-132 >> Makefile.incl
@echo RM = /bin/rm -f >> Makefile.incl
@echo OSDEFS = -DOSX -DNETWORKBYTEORDER >> Makefile.incl
@echo include Makefile.package >> Makefile.incl
@echo >> Makefile.incl
@echo qinp.o: qinp.f normal3d.o >> Makefile.incl
- @echo " \$$(FC) -g -O0 -Wall -Wno-tabs -c -o qinp.o qinp.f" >> Makefile.incl
+ @echo " \$$(FC) \$$(FFLAGS) -g -O0 -Wall -Wno-tabs -c -o qinp.o qinp.f" >> Makefile.incl
@echo >> Makefile.incl
irix5:
@@ -125,9 +125,9 @@
@echo OS=irix5 >> Makefile.incl
@echo SHELL=/bin/sh >> Makefile.incl
@echo CC = cc >> Makefile.incl
- @echo CFLAGS = -g -w >> Makefile.incl
+ @echo CFLAGS += -g -w >> Makefile.incl
@echo FC = f77 >> Makefile.incl
- @echo FFLAGS = -O -Olimit 4500 >> Makefile.incl
+ @echo FFLAGS += -O -Olimit 4500 >> Makefile.incl
@echo RM = /bin/rm -f >> Makefile.incl
irix6:
@@ -135,19 +135,19 @@
@echo OS=irix6 >> Makefile.incl
@echo SHELL=/bin/sh >> Makefile.incl
@echo CC = cc -n32 >> Makefile.incl
- @echo CFLAGS = -g -w >> Makefile.incl
+ @echo CFLAGS += -g -w >> Makefile.incl
@echo FC = f77 >> Makefile.incl
- @echo FFLAGS = -O -n32 -OPT:Olimit=4500 >> Makefile.incl
- @echo LDFLAGS = -L/usr/lib32 >> Makefile.incl
+ @echo FFLAGS += -O -n32 -OPT:Olimit=4500 >> Makefile.incl
+ @echo LDFLAGS += -L/usr/lib32 >> Makefile.incl
@echo RM = /bin/rm -f >> Makefile.incl
dec:
@cp Makefile.template Makefile.incl
@echo OS=dec >> Makefile.incl
@echo CC = cc >> Makefile.incl
- @echo CFLAGS = -O -w >> Makefile.incl
+ @echo CFLAGS += -O -w >> Makefile.incl
@echo FC = f77 >> Makefile.incl
- @echo FFLAGS = -O -static -fast -r8 >> Makefile.incl
+ @echo FFLAGS += -O -static -fast -r8 >> Makefile.incl
@echo RM = /bin/rm -f >> Makefile.incl
@echo OSDEFS = -DNETWORKBYTEORDER >> Makefile.incl
@echo include Makefile.package >> Makefile.incl
@@ -156,10 +156,10 @@
@cp Makefile.template Makefile.incl
@echo OS=aix >> Makefile.incl
@echo CC = cc >> Makefile.incl
- @echo CFLAGS = -g >> Makefile.incl
+ @echo CFLAGS += -g >> Makefile.incl
@echo FC = xlf -qqcount -w >> Makefile.incl
- @echo FFLAGS = -O -qtkq_size=2000 -qintlog -qsave >> Makefile.incl
- @echo LDFLAGS = -lz -bloadmap:loadmap.lis >> Makefile.incl
+ @echo FFLAGS += -O -qtkq_size=2000 -qintlog -qsave >> Makefile.incl
+ @echo LDFLAGS += -lz -bloadmap:loadmap.lis >> Makefile.incl
@echo RM = /bin/rm -f >> Makefile.incl
@echo OSDEFS = -Dlocal_=local -Dungz_=ungz >> Makefile.incl
aix-patch:
@@ -171,19 +171,19 @@
@cp Makefile.template Makefile.incl
@echo OS = sun >> Makefile.incl
@echo CC = gcc >> Makefile.incl
- @echo CFLAGS = -O >> Makefile.incl
+ @echo CFLAGS += -O >> Makefile.incl
@echo FC = g77 >> Makefile.incl
- @echo FFLAGS = -O >> Makefile.incl
+ @echo FFLAGS += -O >> Makefile.incl
@echo RM = /bin/rm -f >> Makefile.incl
- @echo LDFLAGS = -L/usr/local/lib/gcc-lib/sparc-sun-sunos4.1.3_U1/2.6.2 -lgcc >> Makefile.incl
+ @echo LDFLAGS += -L/usr/local/lib/gcc-lib/sparc-sun-sunos4.1.3_U1/2.6.2 -lgcc >> Makefile.incl
sun-forte:
@cp Makefile.template Makefile.incl
@echo OS = sun >> Makefile.incl
@echo CC = cc >> Makefile.incl
- @echo CFLAGS = -fast -`fpversion -foption` >> Makefile.incl
+ @echo CFLAGS += -fast -`fpversion -foption` >> Makefile.incl
@echo FC = f77 >> Makefile.incl
- @echo FFLAGS = \${CFLAGS} >> Makefile.incl
+ @echo FFLAGS += \${CFLAGS} >> Makefile.incl
@echo RM = /bin/rm -f >> Makefile.incl
@@ -200,16 +200,16 @@
all: help $(PROGS)
avs2ps: avs2ps.c
- $(CC) $(CFLAGS) $(FLAGS) $(LDFLAGS) -o avs2ps avs2ps.c -lm
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(FLAGS) $(LDFLAGS) -o avs2ps avs2ps.c -lm
balls: balls.f
$(FC) $(FFLAGS) $(LDFLAGS) -o balls balls.f
local.o: Makefile.incl local.c
- $(CC) $(CFLAGS) $(FLAGS) -c local.c
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(FLAGS) -c local.c $(LDFLAGS)
ungz.o: Makefile.incl ungz.c
- $(CC) $(CFLAGS) $(GDEFS) $(OSDEFS) -c ungz.c
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(GDEFS) $(OSDEFS) -c ungz.c $(LDFLAGS)
ribbon: ribbon.f ribbon1.f modsubs.f
$(FC) $(FFLAGS) $(LDFLAGS) \
--- raster3d.orig/Makefile.incl
+++ raster3d/Makefile.incl
@@ -60,13 +60,13 @@
#
OS = linux
CC = gcc
-CFLAGS = -g -Wall -Dgfortran
+CFLAGS += -g -Wall -Dgfortran
FC = gfortran -std=legacy
-FFLAGS = -g -w -O3 -Wno-tabs -ffixed-line-length-132
+FFLAGS += -g -w -O3 -Wno-tabs -ffixed-line-length-132
RM = /bin/rm -f
OSDEFS = -DLINUX -DNETWORKBYTEORDER
include Makefile.package
qinp.o: qinp.f
- $(FC) -g -O0 -Wall -Wno-tabs -c -o qinp.o qinp.f
+ $(FC) $(FFLAGS) -g -O0 -Wall -Wno-tabs -c -o qinp.o qinp.f $(LDFLAGS)
|