diff options
| author | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2018-06-06 09:39:25 +0000 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2018-06-06 09:39:25 +0000 |
| commit | 3d52d53b1ccd854cb78a8346296a14eca51bd7df (patch) | |
| tree | 2b25598f11222936459d43ebddd0cd955dbdd9cd | |
| parent | 130aa48546da779b8ea38abce6d6ce06b1012e8a (diff) | |
| download | midipix_build-3d52d53b1ccd854cb78a8346296a14eca51bd7df.tar.bz2 midipix_build-3d52d53b1ccd854cb78a8346296a14eca51bd7df.tar.xz | |
vars/build.vars:info{un,}zip_minipix:${PKG_LDFLAGS_BUILD_EXTRA}: explicitly set from ${MINIPIX_LDFLAGS_CONFIGURE} (fixes non-vrfs binaries.)
patches/info{un,}zip_minipix.local.patch: link w/ $(LDFLAGS) (fixes non-vrfs binaries.)
| -rw-r--r-- | patches/infounzip_minipix.local.patch | 15 | ||||
| -rw-r--r-- | patches/infozip_minipix.local.patch | 23 | ||||
| -rw-r--r-- | vars/build.vars | 2 |
3 files changed, 40 insertions, 0 deletions
diff --git a/patches/infounzip_minipix.local.patch b/patches/infounzip_minipix.local.patch new file mode 100644 index 00000000..68a9fa7f --- /dev/null +++ b/patches/infounzip_minipix.local.patch @@ -0,0 +1,15 @@ +--- 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 + diff --git a/patches/infozip_minipix.local.patch b/patches/infozip_minipix.local.patch new file mode 100644 index 00000000..d5db79d9 --- /dev/null +++ b/patches/infozip_minipix.local.patch @@ -0,0 +1,23 @@ +--- 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 + diff --git a/vars/build.vars b/vars/build.vars index dff8125f..90f47d2b 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -1367,7 +1367,9 @@ MINIPIX_PREFIX="${PREFIX}/minipix_dist"; : ${PKG_GZIP_MINIPIX_INSTALL_TARGET:=install-binPROGRAMS}; : ${PKG_GZIP_MINIPIX_MAKEFLAGS_INSTALL_EXTRA:="OBJA="}; : ${PKG_INFOUNZIP_MINIPIX_INHERIT_FROM:=infounzip}; +: ${PKG_INFOUNZIP_MINIPIX_LDFLAGS_BUILD_EXTRA:=${MINIPIX_LDFLAGS_CONFIGURE}}; : ${PKG_INFOZIP_MINIPIX_INHERIT_FROM:=infozip}; +: ${PKG_INFOZIP_MINIPIX_LDFLAGS_BUILD_EXTRA:=${MINIPIX_LDFLAGS_CONFIGURE}}; : ${PKG_LESS_MINIPIX_INHERIT_FROM:=less}; : ${PKG_NANO_MINIPIX_INHERIT_FROM:=nano}; : ${PKG_PATCH_MINIPIX_INHERIT_FROM:=patch}; |