vars/build.vars:info{,un}zip:${PKG_CFLAGS_BUILD_EXTRA}: inherit from ${NATIVE_PACKAGES_CFLAGS_CONFIGURE}.

patches/info{,un}zip{,_minipix}.local.patch: correctly inherit $(CFLAGS) & pass $(LDFLAGS).

4 files changed, 58 insertions, 38 deletions

diff --git a/patches/infounzip.local.patch b/patches/infounzip.local.patch
new file mode 100644
index 00000000..f8d3c1c6
--- /dev/null
+++ b/patches/infounzip.local.patch
@@ -0,0 +1,24 @@
+--- infounzip/Makefile.dist	2019-04-26 18:39:08.660000000 +0000
++++ infounzip/Makefile	2019-06-16 16:37:56.980000000 +0000
+@@ -10,7 +10,7 @@
+ INSTALL_PROGRAM = cp
+ INSTALL_D = mkdir -p
+ 
+-CFLAGS ?= -I. -DUNIX -DNO_BZIP2_SUPPORT -DLARGE_FILE_SUPPORT -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUNICODE_SUPPORT -DUTF8_MAYBE_NATIVE -DNO_LCHMOD -DHAVE_DIRENT_H -DHAVE_TERMIOS_H -D_MBCS
++override CFLAGS += -I. -DUNIX -DNO_BZIP2_SUPPORT -DLARGE_FILE_SUPPORT -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUNICODE_SUPPORT -DUTF8_MAYBE_NATIVE -DNO_LCHMOD -DHAVE_DIRENT_H -DHAVE_TERMIOS_H -D_MBCS
+ LFLAGS1 ?=
+ LDFLAGS ?=
+ 
+@@ -38,10 +38,10 @@
+ $(OBJF): $(UNZIP_H)
+ 
+ unzip: $(OBJU)
+-	$(CC) -o unzip $(LFLAGS1) $(OBJU) $(LDFLAGS)
++	$(CC) -o unzip $(LFLAGS1) $(LDFLAGS) $(OBJU)
+ 
+ funzip: $(OBJF)
+-	$(CC) -o funzip $(LFLAGS1) $(OBJF) $(LDFLAGS)
++	$(CC) -o funzip $(LFLAGS1) $(LDFLAGS) $(OBJF)
+ 
+ UNZIPS = unzip funzip
+ 
diff --git a/patches/infounzip_minipix.local.patch b/patches/infounzip_minipix.local.patch
index 68a9fa7f..08f8112e 100644..120000
--- a/patches/infounzip_minipix.local.patch
+++ b/patches/infounzip_minipix.local.patch
@@ -1,15 +1 @@
---- infounzip/Makefile.orig	2018-05-14 22:16:49.060000000 +0000
-+++ infounzip/Makefile	2018-06-06 09:34:33.224000000 +0000
-@@ -38,10 +38,10 @@
- $(OBJF): $(UNZIP_H)
- 
- unzip: $(OBJU)
--	$(CC) -o unzip $(LFLAGS1) $(OBJU) $(LDFLAGS)
-+	$(CC) -o unzip $(LFLAGS1) $(LDFLAGS) $(OBJU) $(LDFLAGS)
- 
- funzip: $(OBJF)
--	$(CC) -o funzip $(LFLAGS1) $(OBJF) $(LDFLAGS)
-+	$(CC) -o funzip $(LFLAGS1) $(LDFLAGS) $(OBJF) $(LDFLAGS)
- 
- UNZIPS = unzip funzip
- 
+infounzip.local.patch
\ No newline at end of file
diff --git a/patches/infozip.local.patch b/patches/infozip.local.patch
new file mode 100644
index 00000000..4af76831
--- /dev/null
+++ b/patches/infozip.local.patch
@@ -0,0 +1,32 @@
+--- infozip/Makefile.dist	2019-04-26 18:39:23.212000000 +0000
++++ infozip/Makefile	2019-06-16 16:39:03.728000000 +0000
+@@ -10,7 +10,7 @@
+ INSTALL_PROGRAM = cp
+ INSTALL_D = mkdir -p
+ 
+-CFLAGS ?= -I. -DUNIX -DHAVE_TERMIOS_H -DNO_BZIP2_SUPPORT -DLARGE_FILE_SUPPORT -DUNICODE_SUPPORT -DHAVE_DIRENT_H -DUIDGID_NOT_16BIT
++override CFLAGS += -I. -DUNIX -DHAVE_TERMIOS_H -DNO_BZIP2_SUPPORT -DLARGE_FILE_SUPPORT -DUNICODE_SUPPORT -DHAVE_DIRENT_H -DUIDGID_NOT_16BIT
+ LFLAGS1 ?=
+ LDFLAGS ?=
+ 
+@@ -45,16 +45,16 @@
+ $(OBJC): $(ZIP_H)
+ 
+ zip: $(OBJZ) $(OBJI)
+-	$(CC) -o zip $(LFLAGS1) $(OBJZ) $(OBJI) $(LDFLAGS)
++	$(CC) -o zip $(LFLAGS1) $(LDFLAGS) $(OBJZ) $(OBJI)
+ 
+ zipnote: $(OBJN)
+-	$(CC) -o zipnote $(LFLAGS1) $(OBJN) $(LDFLAGS)
++	$(CC) -o zipnote $(LFLAGS1) $(LDFLAGS) $(OBJN)
+ 
+ zipcloak: $(OBJC)
+-	$(CC) -o zipcloak $(LFLAGS1) $(OBJC) $(LDFLAGS)
++	$(CC) -o zipcloak $(LFLAGS1) $(LDFLAGS) $(OBJC)
+ 
+ zipsplit: $(OBJS)
+-	$(CC) -o zipsplit $(LFLAGS1) $(OBJS) $(LDFLAGS)
++	$(CC) -o zipsplit $(LFLAGS1) $(LDFLAGS) $(OBJS)
+ 
+ ZIPS = zip zipcloak zipnote zipsplit
+ 
diff --git a/patches/infozip_minipix.local.patch b/patches/infozip_minipix.local.patch
index d5db79d9..25a5bcd2 100644..120000
--- a/patches/infozip_minipix.local.patch
+++ b/patches/infozip_minipix.local.patch
@@ -1,23 +1 @@
---- infozip/Makefile.orig	2018-05-14 22:16:50.436000000 +0000
-+++ infozip/Makefile	2018-06-06 09:34:02.456000000 +0000
-@@ -45,16 +45,16 @@
- $(OBJC): $(ZIP_H)
- 
- zip: $(OBJZ) $(OBJI)
--	$(CC) -o zip $(LFLAGS1) $(OBJZ) $(OBJI) $(LDFLAGS)
-+	$(CC) -o zip $(LFLAGS1) $(LDFLAGS) $(OBJZ) $(OBJI) $(LDFLAGS)
- 
- zipnote: $(OBJN)
--	$(CC) -o zipnote $(LFLAGS1) $(OBJN) $(LDFLAGS)
-+	$(CC) -o zipnote $(LFLAGS1) $(LDFLAGS) $(OBJN) $(LDFLAGS)
- 
- zipcloak: $(OBJC)
--	$(CC) -o zipcloak $(LFLAGS1) $(OBJC) $(LDFLAGS)
-+	$(CC) -o zipcloak $(LFLAGS1) $(LDFLAGS) $(OBJC) $(LDFLAGS)
- 
- zipsplit: $(OBJS)
--	$(CC) -o zipsplit $(LFLAGS1) $(OBJS) $(LDFLAGS)
-+	$(CC) -o zipsplit $(LFLAGS1) $(LDFLAGS) $(OBJS) $(LDFLAGS)
- 
- ZIPS = zip zipcloak zipnote zipsplit
- 
+infozip.local.patch
\ No newline at end of file