From 6c4b16f06298698b227a2bce1cf8de9b160f0007 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Sat, 15 Oct 2011 00:07:23 -0300 Subject: dash: bump to version 0.5.7-2 and style cleanup Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- .../dash-0.5.5.1-no-config.h-for-helpers.patch | 35 ---------------------- .../dash/dash-0.5.7-no-config.h-for-helpers.patch | 35 ++++++++++++++++++++++ package/dash/dash.mk | 9 +++--- 3 files changed, 40 insertions(+), 39 deletions(-) delete mode 100644 package/dash/dash-0.5.5.1-no-config.h-for-helpers.patch create mode 100644 package/dash/dash-0.5.7-no-config.h-for-helpers.patch diff --git a/package/dash/dash-0.5.5.1-no-config.h-for-helpers.patch b/package/dash/dash-0.5.5.1-no-config.h-for-helpers.patch deleted file mode 100644 index 9fd449c41..000000000 --- a/package/dash/dash-0.5.5.1-no-config.h-for-helpers.patch +++ /dev/null @@ -1,35 +0,0 @@ -[PATCH] Don't include config.h when building helpers using the native compiler - -config.h contains settings for the cross compiler (most importantly -32/64bit versions of functions), so don't include it when calling the -native compiler to build the helpers. - -Otherwise we get build errors like: - -/usr/bin/gcc -include ../config.h -DBSD=1 -DSHELL -DIFS_BROKEN -g -O2 -Wall -o mkinit mkinit.c -In file included from /usr/include/sys/stat.h:107, - from /usr/include/fcntl.h:38, - from mkinit.c:50: -/usr/include/bits/stat.h:117: error: redefinition of ‘struct stat’ -In file included from /usr/include/fcntl.h:38, - from mkinit.c:50: -/usr/include/sys/stat.h:504: error: redefinition of ‘stat’ -/usr/include/sys/stat.h:455: note: previous definition of ‘stat’ was here - -Signed-off-by: Peter Korsgaard ---- - src/Makefile.in | 1 - - 1 file changed, 1 deletion(-) - -Index: dash-0.5.5.1/src/Makefile.in -=================================================================== ---- dash-0.5.5.1.orig/src/Makefile.in -+++ dash-0.5.5.1/src/Makefile.in -@@ -165,7 +165,6 @@ COMMON_CPPFLAGS = \ - AM_CFLAGS = $(COMMON_CFLAGS) - AM_CPPFLAGS = $(COMMON_CPPFLAGS) - AM_CFLAGS_FOR_BUILD = -g -O2 $(COMMON_CFLAGS) --AM_CPPFLAGS_FOR_BUILD = $(COMMON_CPPFLAGS) - COMPILE_FOR_BUILD = \ - $(CC_FOR_BUILD) $(AM_CPPFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) \ - $(AM_CFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) diff --git a/package/dash/dash-0.5.7-no-config.h-for-helpers.patch b/package/dash/dash-0.5.7-no-config.h-for-helpers.patch new file mode 100644 index 000000000..9fd449c41 --- /dev/null +++ b/package/dash/dash-0.5.7-no-config.h-for-helpers.patch @@ -0,0 +1,35 @@ +[PATCH] Don't include config.h when building helpers using the native compiler + +config.h contains settings for the cross compiler (most importantly +32/64bit versions of functions), so don't include it when calling the +native compiler to build the helpers. + +Otherwise we get build errors like: + +/usr/bin/gcc -include ../config.h -DBSD=1 -DSHELL -DIFS_BROKEN -g -O2 -Wall -o mkinit mkinit.c +In file included from /usr/include/sys/stat.h:107, + from /usr/include/fcntl.h:38, + from mkinit.c:50: +/usr/include/bits/stat.h:117: error: redefinition of ‘struct stat’ +In file included from /usr/include/fcntl.h:38, + from mkinit.c:50: +/usr/include/sys/stat.h:504: error: redefinition of ‘stat’ +/usr/include/sys/stat.h:455: note: previous definition of ‘stat’ was here + +Signed-off-by: Peter Korsgaard +--- + src/Makefile.in | 1 - + 1 file changed, 1 deletion(-) + +Index: dash-0.5.5.1/src/Makefile.in +=================================================================== +--- dash-0.5.5.1.orig/src/Makefile.in ++++ dash-0.5.5.1/src/Makefile.in +@@ -165,7 +165,6 @@ COMMON_CPPFLAGS = \ + AM_CFLAGS = $(COMMON_CFLAGS) + AM_CPPFLAGS = $(COMMON_CPPFLAGS) + AM_CFLAGS_FOR_BUILD = -g -O2 $(COMMON_CFLAGS) +-AM_CPPFLAGS_FOR_BUILD = $(COMMON_CPPFLAGS) + COMPILE_FOR_BUILD = \ + $(CC_FOR_BUILD) $(AM_CPPFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) \ + $(AM_CFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) diff --git a/package/dash/dash.mk b/package/dash/dash.mk index db2d4e5a5..26c6431b6 100644 --- a/package/dash/dash.mk +++ b/package/dash/dash.mk @@ -3,10 +3,11 @@ # dash # ############################################################# -DASH_VERSION:=0.5.5.1 -DASH_SOURCE:=dash_$(DASH_VERSION).orig.tar.gz -DASH_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/d/dash -DASH_PATCH:=dash_$(DASH_VERSION)-6.diff.gz + +DASH_VERSION = 0.5.7 +DASH_SOURCE = dash_$(DASH_VERSION).orig.tar.gz +DASH_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/d/dash +DASH_PATCH = dash_$(DASH_VERSION)-2.diff.gz define DASH_INSTALL_TARGET_CMDS cp -a $(@D)/src/dash $(TARGET_DIR)/bin/dash -- cgit v1.2.3