Package: zip Version: 3.0-6 Severity: normal Tags: patch User: crossbu...@debian.org Usertags: origin-ubuntu raring ubuntu-patch cross
In Ubuntu, I've applied the attached patch to fix cross-builds. I imagine its intent should be fairly self-explanatory, so I'll let the changes speak for themselves. ... Adam -- System Information: Debian Release: wheezy/sid APT prefers raring-updates APT policy: (500, 'raring-updates'), (500, 'raring-security'), (500, 'raring') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.7.0-4-generic (SMP w/4 CPU cores) Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
diff -Nru zip-3.0/debian/changelog zip-3.0/debian/changelog diff -Nru zip-3.0/debian/rules zip-3.0/debian/rules --- zip-3.0/debian/rules 2012-05-21 11:08:02.000000000 -0600 +++ zip-3.0/debian/rules 2012-12-07 16:35:01.000000000 -0700 @@ -7,17 +7,20 @@ CFLAGS := `dpkg-buildflags --get CFLAGS` -Wall -I. -DUNIX LDFLAGS := `dpkg-buildflags --get LDFLAGS` CPPFLAGS := `dpkg-buildflags --get CPPFLAGS` -STRIP = true +STRIP = strip DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) CC=$(DEB_HOST_GNU_TYPE)-gcc + STRIP=$(DEB_HOST_GNU_TYPE)-strip endif ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - STRIP = strip --remove-section=.comment --remove-section=.note + STRIP += --remove-section=.comment --remove-section=.note +else + STRIP = true endif build:
