diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-14 12:58:25 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-14 12:58:25 +0000 |
| commit | f8b544ad8eef4c7cfea133073d7360cb4e44ddf3 (patch) | |
| tree | 7d9d190039f70569d87e655b4ac9ecc0e5f5ae4a /debian/patches | |
| parent | Adding upstream version 1.13. (diff) | |
| download | zutils-f8b544ad8eef4c7cfea133073d7360cb4e44ddf3.tar.xz zutils-f8b544ad8eef4c7cfea133073d7360cb4e44ddf3.zip | |
Adding debian version 1.13-2.debian/1.13-2
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/debian/0001-build.patch | 21 | ||||
| -rw-r--r-- | debian/patches/debian/0002-zupdate.patch | 15 | ||||
| -rw-r--r-- | debian/patches/series | 2 |
3 files changed, 38 insertions, 0 deletions
diff --git a/debian/patches/debian/0001-build.patch b/debian/patches/debian/0001-build.patch new file mode 100644 index 0000000..67349c7 --- /dev/null +++ b/debian/patches/debian/0001-build.patch @@ -0,0 +1,21 @@ +Author: Daniel Baumann <daniel.baumann@progress-linux.org> +Description: Avoid overwriting build-environment. + +diff -Naurp zutils.orig/configure zutils/configure +--- zutils.orig/configure ++++ zutils/configure +@@ -20,10 +20,10 @@ datarootdir='$(prefix)/share' + infodir='$(datarootdir)/info' + mandir='$(datarootdir)/man' + sysconfdir='$(prefix)/etc' +-CXX=g++ +-CPPFLAGS= +-CXXFLAGS='-Wall -W -O2' +-LDFLAGS= ++#CXX=g++ ++#CPPFLAGS= ++#CXXFLAGS='-Wall -W -O2' ++#LDFLAGS= + MAKEINFO=makeinfo + DIFF=diff + GREP=grep diff --git a/debian/patches/debian/0002-zupdate.patch b/debian/patches/debian/0002-zupdate.patch new file mode 100644 index 0000000..45c27f9 --- /dev/null +++ b/debian/patches/debian/0002-zupdate.patch @@ -0,0 +1,15 @@ +Author: Daniel Baumann <daniel.baumann@progress-linux.org> +Description: Avoid linking zupdate statically. + +diff -Naurp zutils.orig/Makefile.in zutils/Makefile.in +--- zutils.orig/Makefile.in ++++ zutils/Makefile.in +@@ -52,7 +52,7 @@ ztest : $(ztest_objs) + $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(ztest_objs) + + zupdate : $(zupdate_objs) +- $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(zupdate_objs) ++ $(CXX) $(CXXFLAGS) -o $@ $(zupdate_objs) + + rc.o : rc.cc + $(CXX) $(CPPFLAGS) $(CXXFLAGS) -DPROGVERSION=\"$(pkgversion)\" -DSYSCONFDIR=\"$(sysconfdir)\" -c -o $@ $< diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..a353e88 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +debian/0001-build.patch +debian/0002-zupdate.patch |