diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2020-08-04 13:31:38 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2020-08-05 20:20:43 +0200 |
| commit | 70febec565507524921c099658a4b2b5d878cc28 (patch) | |
| tree | 1f74ebd8b6c2ed7fa48143f038cec88dc42f0e6e | |
| parent | 7ff823f93819a6cf01708f67032ca83c2684e094 (diff) | |
toybox: update to latest
| -rw-r--r-- | package/toybox/Makefile | 6 | ||||
| -rw-r--r-- | package/toybox/patches/patch-lib_lib_h | 12 | ||||
| -rw-r--r-- | package/toybox/patches/patch-lib_portability_h | 22 | ||||
| -rw-r--r-- | package/toybox/patches/patch-scripts_make_sh | 8 |
4 files changed, 3 insertions, 45 deletions
diff --git a/package/toybox/Makefile b/package/toybox/Makefile index 3a620a092..c32c3aac5 100644 --- a/package/toybox/Makefile +++ b/package/toybox/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= toybox -PKG_VERSION:= 0.7.1 +PKG_VERSION:= 0.8.3 PKG_RELEASE:= 1 -PKG_HASH:= 5bb3069f58faf12940d5cfde3209ac7f63210bebdd9023979b0c20cede126ea7 +PKG_HASH:= eab28fd29d19d4e61ef09704e5871940e6f35fd35a3bb1285e41f204504b5c01 PKG_DESCR:= linux tools collection PKG_SECTION:= base/apps PKG_URL:= http://landley.net/toybox/ @@ -24,7 +24,7 @@ XAKE_FLAGS+= CC="gcc" V=1 PREFIX="$(WRKINST)" do-configure: -rm $(WRKBUILD)/toys/other/swap*.c - cd $(WRKBUILD); PATH='$(HOST_PATH)' $(MAKE) defconfig + cd $(WRKBUILD); CC="gcc" PATH='$(HOST_PATH)' $(MAKE) defconfig toybox-install: $(CP) $(WRKINST)/* $(IDIR_TOYBOX)/ diff --git a/package/toybox/patches/patch-lib_lib_h b/package/toybox/patches/patch-lib_lib_h deleted file mode 100644 index 0697acb22..000000000 --- a/package/toybox/patches/patch-lib_lib_h +++ /dev/null @@ -1,12 +0,0 @@ ---- toybox-0.7.1.orig/lib/lib.h 2016-06-01 00:33:23.000000000 +0200 -+++ toybox-0.7.1/lib/lib.h 2016-10-16 12:33:42.000000000 +0200 -@@ -201,7 +201,9 @@ int qstrcmp(const void *a, const void *b - void create_uuid(char *uuid); - char *show_uuid(char *uuid); - char *next_printf(char *s, char **start); -+#ifndef __APPLE__ - char *strnstr(char *line, char *str); -+#endif - int dev_minor(int dev); - int dev_major(int dev); - int dev_makedev(int major, int minor); diff --git a/package/toybox/patches/patch-lib_portability_h b/package/toybox/patches/patch-lib_portability_h deleted file mode 100644 index 25c24d19c..000000000 --- a/package/toybox/patches/patch-lib_portability_h +++ /dev/null @@ -1,22 +0,0 @@ ---- toybox-0.7.1.orig/lib/portability.h 2016-06-01 00:33:23.000000000 +0200 -+++ toybox-0.7.1/lib/portability.h 2016-10-16 12:32:11.000000000 +0200 -@@ -22,7 +22,9 @@ - - // This isn't in the spec, but it's how we determine what libc we're using. - -+#ifndef __APPLE__ - #include <features.h> -+#endif - - // Types various replacement prototypes need - #include <sys/types.h> -@@ -211,7 +213,9 @@ ssize_t getline(char **lineptr, size_t * - - // Linux headers not listed by POSIX or LSB - #include <sys/mount.h> -+#ifndef __APPLE__ - #include <sys/swap.h> -+#endif - - // Android is missing some headers and functions - // "generated/config.h" is included first diff --git a/package/toybox/patches/patch-scripts_make_sh b/package/toybox/patches/patch-scripts_make_sh deleted file mode 100644 index dfbad59a7..000000000 --- a/package/toybox/patches/patch-scripts_make_sh +++ /dev/null @@ -1,8 +0,0 @@ ---- toybox-0.7.1.orig/scripts/make.sh 2016-06-01 00:33:23.000000000 +0200 -+++ toybox-0.7.1/scripts/make.sh 2016-10-16 12:27:17.000000000 +0200 -@@ -1,4 +1,5 @@ - #!/bin/bash -+set -x - - # Grab default values for $CFLAGS and such. - |