summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@uclibc-ng.org>2016-01-16 18:12:01 +0100
committerWaldemar Brodkorb <wbx@uclibc-ng.org>2016-01-16 18:12:01 +0100
commit329c31246e8aea3d3a1890ea839776d707b4617f (patch)
treef19cab7fef2ae5ca0765156432b60c1e08b26f26 /package
parentf598695844a9f10a14b87c22eb28c8557a0b6662 (diff)
fix musl build, reported via IRC
Diffstat (limited to 'package')
-rw-r--r--package/gzip/Makefile4
-rw-r--r--package/gzip/patches/patch-lib_fseeko_c18
-rw-r--r--package/gzip/patches/patch-m4_fflush_m429
3 files changed, 50 insertions, 1 deletions
diff --git a/package/gzip/Makefile b/package/gzip/Makefile
index 2408989e9..0a4c40c42 100644
--- a/package/gzip/Makefile
+++ b/package/gzip/Makefile
@@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= gzip
PKG_VERSION:= 1.6
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_HASH:= 37dfed1a485d53212c43b3fa2a7c7952f09bf5cd86e37121c222341ee1b27847
PKG_DESCR:= compression utility
PKG_SECTION:= app/archive
@@ -17,6 +17,8 @@ include $(ADK_TOPDIR)/mk/package.mk
$(eval $(call PKG_template,GZIP,gzip,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+AUTOTOOL_STYLE:= autoreconf
+
gzip-install:
$(INSTALL_DIR) $(IDIR_GZIP)/usr/bin
$(CP) $(WRKINST)/usr/bin/* $(IDIR_GZIP)/usr/bin
diff --git a/package/gzip/patches/patch-lib_fseeko_c b/package/gzip/patches/patch-lib_fseeko_c
new file mode 100644
index 000000000..fab1b6c9e
--- /dev/null
+++ b/package/gzip/patches/patch-lib_fseeko_c
@@ -0,0 +1,18 @@
+--- gzip-1.6.orig/lib/fseeko.c 2013-04-07 03:59:54.000000000 +0200
++++ gzip-1.6/lib/fseeko.c 2016-01-14 16:58:56.000000000 +0100
+@@ -99,8 +99,14 @@ fseeko (FILE *fp, off_t offset, int when
+ #elif defined EPLAN9 /* Plan9 */
+ if (fp->rp == fp->buf
+ && fp->wp == fp->buf)
++#elif FUNC_FFLUSH_STDIN < 0 && 200809 <= _POSIX_VERSION
++ /* Cross-compiling to some other system advertising conformance to
++ POSIX.1-2008 or later. Assume fseeko and fflush work as advertised.
++ If this assumption is incorrect, please report the bug to
++ bug-gnulib. */
++ if (0)
+ #else
+- #error "Please port gnulib fseeko.c to your platform! Look at the code in fpurge.c, then report this to bug-gnulib."
++ #error "Please port gnulib fseeko.c to your platform! Look at the code in fseeko.c, then report this to bug-gnulib."
+ #endif
+ {
+ /* We get here when an fflush() call immediately preceded this one (or
diff --git a/package/gzip/patches/patch-m4_fflush_m4 b/package/gzip/patches/patch-m4_fflush_m4
new file mode 100644
index 000000000..6954fa2c4
--- /dev/null
+++ b/package/gzip/patches/patch-m4_fflush_m4
@@ -0,0 +1,29 @@
+--- gzip-1.6.orig/m4/fflush.m4 2013-06-09 22:37:56.000000000 +0200
++++ gzip-1.6/m4/fflush.m4 2016-01-14 17:07:56.000000000 +0100
+@@ -14,7 +14,15 @@ AC_DEFUN([gl_FUNC_FFLUSH],
+ [
+ AC_REQUIRE([gl_STDIO_H_DEFAULTS])
+ gl_FUNC_FFLUSH_STDIN
+- if test $gl_cv_func_fflush_stdin = no; then
++ case $gl_cv_func_fflush_stdin in
++ yes) gl_func_fflush_stdin=1 ;;
++ no) gl_func_fflush_stdin=0 ;;
++ *) gl_func_fflush_stdin='(-1)' ;;
++ esac
++ AC_DEFINE_UNQUOTED([FUNC_FFLUSH_STDIN], [$gl_func_fflush_stdin],
++ [Define to 1 if fflush is known to work on stdin as per POSIX.1-2008,
++ 0 if fflush is known to not work, -1 if unknown.])
++ if test $gl_cv_func_fflush_stdin != yes; then
+ REPLACE_FFLUSH=1
+ fi
+ ])
+@@ -72,8 +80,7 @@ AC_DEFUN([gl_FUNC_FFLUSH_STDIN],
+ return 7;
+ return 0;
+ ]])], [gl_cv_func_fflush_stdin=yes], [gl_cv_func_fflush_stdin=no],
+- [dnl Pessimistically assume fflush is broken.
+- gl_cv_func_fflush_stdin=no])
++ [gl_cv_func_fflush_stdin=cross])
+ rm conftest.txt
+ ])
+ ])