[hamradio-commits] [liquid-dsp] 06/10: Drop fix-makefile patch, integrated upstream
Andreas E. Bombe
aeb at moszumanska.debian.org
Sun Oct 29 00:54:28 UTC 2017
This is an automated email from the git hooks/post-receive script.
aeb pushed a commit to annotated tag debian/1.3.1-1
in repository liquid-dsp.
commit 83a3fdb7d6ef171ef88fa5d3539ecc77e5b93993
Author: Andreas Bombe <aeb at debian.org>
Date: Sat Oct 28 20:21:53 2017 +0200
Drop fix-makefile patch, integrated upstream
---
debian/changelog | 1 +
debian/patches/fix-makefile | 155 --------------------------------------------
debian/patches/series | 1 -
3 files changed, 1 insertion(+), 156 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 20b398a..5b21b42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ liquid-dsp (1.3.1-1) UNRELEASED; urgency=medium
* New upstream release 1.3.1
* Update debian/copyright for source changes
+ * Drop fix-makefile patch, integrated upstream
* Remove dh-autoreconf from Build-Depends, not needed with debhelper compat
level 10
diff --git a/debian/patches/fix-makefile b/debian/patches/fix-makefile
deleted file mode 100644
index 78c836b..0000000
--- a/debian/patches/fix-makefile
+++ /dev/null
@@ -1,155 +0,0 @@
-Description: Fix overloading of LDFLAGS and CFLAGS in makefile.in
- The makefile.in used the variable LDFLAGS for both flags and libraries
- to link. This will create problems as many flags need to appear before
- the object files while the libraries to link need to appear after. A
- similar problem stems from using CFLAGS for both include path
- specifications and regular C compiler flags, as the CFLAGS are needed
- for proper linking.
- .
- This patch splits LDFLAGS into LDFLAGS for flags only and LIBS for libs
- only and splits CFLAGS into CFLAGS for compiler flags only and CPPFLAGS
- for include path specifications only. Linking now changes LDFLAGS to
- LIBS and adds CFLAGS and LDFLAGS at the beginning of the command. The
- previously ignored @CPPFLAGS@ autoconf value is now also included in
- CPPFLAGS.
-Author: Andreas Bombe <aeb at debian.org>
-Last-Update: 2016-12-11
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/makefile.in
-+++ b/makefile.in
-@@ -63,11 +63,13 @@
- RANLIB := ranlib
-
- # flags
--INCLUDE_CFLAGS = $(addprefix -I ,$(include_dirs))
-+INCLUDE_CFLAGS = $(addprefix -I,$(include_dirs))
- CONFIG_CFLAGS = @CFLAGS@ @DEBUG_OPTION@ @ARCH_OPTION@
- # -g : debugging info
--CFLAGS += $(INCLUDE_CFLAGS) -Wall -fPIC $(CONFIG_CFLAGS)
--LDFLAGS += @LDFLAGS@ @LIBS@
-+CPPFLAGS = @CPPFLAGS@ $(INCLUDE_CFLAGS)
-+CFLAGS = $(CONFIG_CFLAGS) -Wall -fPIC
-+LDFLAGS = @LDFLAGS@
-+LIBS = @LIBS@
- ARFLAGS = r
- PATHSEP = /
-
-@@ -1166,7 +1168,7 @@
-
- # linux, et al
- libliquid.so: libliquid.a
-- $(CC) -shared -Xlinker -soname=$@ -o $@ -Wl,-whole-archive $^ -Wl,-no-whole-archive $(LDFLAGS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -Xlinker -soname=$@ -o $@ -Wl,-whole-archive $^ -Wl,-no-whole-archive $(LIBS)
-
- all: libliquid.a $(SHARED_LIB)
-
-@@ -1222,10 +1224,10 @@
- autoscript : scripts/autoscript
-
- scripts/autoscript.o scripts/main.o : %.o : %.c
-- $(CC) $(CFLAGS) -c -o $@ $<
-+ $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
-
- scripts/autoscript : scripts/autoscript.o scripts/main.o
-- $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
-
- clean-autoscript :
- $(RM) scripts/autoscript.o scripts/main.o scripts/autoscript
-@@ -1251,23 +1253,23 @@
- # the '-x c' flag
- autotest_obj = $(patsubst %.c,%.o,$(autotest_sources))
- $(autotest_obj) : %.o : %.c $(include_headers)
-- $(CC) $(CFLAGS) $< -c -o $@
-+ $(CC) $(CPPFLAGS) $(CFLAGS) $< -c -o $@
-
- # additional autotest objects
- $(autotest_extra_obj) : %.o : %.c $(include_headers)
-
- # compile the autotest internal library functions without linking
- autotest/autotestlib.o : autotest/autotestlib.c autotest/autotest.h
-- $(CC) $(CFLAGS) $< -c -o $@
-+ $(CC) $(CPPFLAGS) $(CFLAGS) $< -c -o $@
-
- # compile the autotest program without linking
- $(autotest_prog).o : autotest/autotest.c autotest/autotest.h autotest_include.h
-- $(CC) $(CFLAGS) $< -c -o $@
-+ $(CC) $(CPPFLAGS) $(CFLAGS) $< -c -o $@
-
- # link the autotest program with the objects
- # NOTE: linked libraries must come _after_ the target program
- $(autotest_prog): $(autotest_prog).o $(autotest_obj) $(autotest_extra_obj) autotest/autotestlib.o libliquid.a
-- $(CC) $^ -o $@ $(LDFLAGS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(LIBS)
-
- # run the autotest program
- check: $(autotest_prog)
-@@ -1292,8 +1294,10 @@
- # on the target platform.
- .PHONY: bench
- bench_prog = benchmark
--BENCH_CFLAGS = -Wall $(INCLUDE_CFLAGS) $(CONFIG_CFLAGS)
-+BENCH_CPPFLAGS = $(CONFIG_CPPFLAGS)
-+BENCH_CFLAGS = -Wall $(CONFIG_CFLAGS)
- BENCH_LDFLAGS = $(LDFLAGS)
-+BENCH_LIBS = $(LIBS)
-
- # run the benchmark generator script to create benchmark_include.h
- benchmark_include.h : scripts/autoscript $(benchmark_sources) $(include_headers)
-@@ -1305,19 +1309,19 @@
- # the '-x c' flag
- benchmark_obj = $(patsubst %.c,%.o,$(benchmark_sources))
- $(benchmark_obj) : %.o : %.c $(include_headers)
-- $(CC) $(BENCH_CFLAGS) $< -c -o $@
-+ $(CC) $(BENCH_CPPFLAGS) $(BENCH_CFLAGS) $< -c -o $@
-
- # additional benchmark objects
- $(benchmark_extra_obj) : %.o : %.c $(include_headers)
-
- # compile the benchmark program without linking
- $(bench_prog).o: bench/bench.c benchmark_include.h bench/bench.c
-- $(CC) $(BENCH_CFLAGS) $< -c -o $(bench_prog).o
-+ $(CC) $(BENCH_CPPFLAGS) $(BENCH_CFLAGS) $< -c -o $(bench_prog).o
-
- # link the benchmark program with the library objects
- # NOTE: linked libraries must come _after_ the target program
- $(bench_prog): $(bench_prog).o $(benchmark_obj) $(benchmark_extra_obj) libliquid.a
-- $(CC) $^ -o $(bench_prog) $(BENCH_LDFLAGS)
-+ $(CC) $(BENCH_CFLAGS) $(BENCH_LDFLAGS) $^ -o $(bench_prog) $(BENCH_LIBS)
-
- # run the benchmark program
- bench: $(bench_prog)
-@@ -1325,14 +1329,14 @@
-
- # benchmark compare script
- scripts/benchmark_compare : % : %.c
-- $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS)
-+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS)
-
- # fftbench program
- bench/fftbench.o : %.o : %.c
-- $(CC) $(BENCH_CFLAGS) $< -c -o $@
-+ $(CC) $(BENCH_CPPFLAGS) $(BENCH_CFLAGS) $< -c -o $@
-
- bench/fftbench : % : %.o libliquid.a
-- $(CC) $^ -o $@ $(BENCH_LDFLAGS)
-+ $(CC) $(BENCH_CFLAGS) $(BENCH_LDFLAGS) $^ -o $@ $(BENCH_LIBS)
-
- # clean up the generated files
- clean-bench:
-@@ -1482,13 +1486,11 @@
- example_objects = $(patsubst %,%.o,$(example_programs))
- examples: $(example_programs)
-
--EXAMPLES_LDFLAGS = $(LDFLAGS)
--
- # NOTE: linked libraries must come _after_ the target program
- $(example_objects): %.o : %.c
-
- $(example_programs): % : %.o libliquid.a
-- $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(LIBS)
-
- # clean examples
- clean-examples:
diff --git a/debian/patches/series b/debian/patches/series
index 517f12a..a1074c8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-fix-makefile
define-soname
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/liquid-dsp.git
More information about the pkg-hamradio-commits
mailing list