fix native build

4 files changed, 1 insertions, 72 deletions

diff --git a/package/cdrtools/Makefile b/package/cdrtools/Makefile
index 4a5438c3e..9483ad7b9 100644
--- a/package/cdrtools/Makefile
+++ b/package/cdrtools/Makefile
@@ -19,7 +19,7 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,CDRTOOLS,cdrtools,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIG_STYLE:=		manual
-MAKE_ENV+=		ARCH=$(CPU_ARCH) OSNAME=linux CCOM=gcc "CC_COM=$(TARGET_CC)"
+XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
 
 cdrtools-install:
 	$(INSTALL_DIR) $(IDIR_CDRTOOLS)/usr/bin
@@ -31,7 +31,5 @@ cdrtools-install:
 		$(IDIR_CDRTOOLS)/usr/bin
 	$(INSTALL_BIN) $(WRKINST)/opt/schily/bin/cdda2wav \
 		$(IDIR_CDRTOOLS)/usr/bin
-	$(INSTALL_BIN) $(WRKINST)/opt/schily/bin/rscsi \
-		$(IDIR_CDRTOOLS)/usr/bin
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/cdrtools/patches/patch-RULES_mk-gmake_id b/package/cdrtools/patches/patch-RULES_mk-gmake_id
deleted file mode 100644
index d0ee1e675..000000000
--- a/package/cdrtools/patches/patch-RULES_mk-gmake_id
+++ /dev/null
@@ -1,11 +0,0 @@
---- cdrtools-3.01.orig/RULES/mk-gmake.id	2011-06-23 20:10:43.000000000 +0200
-+++ cdrtools-3.01/RULES/mk-gmake.id	2012-03-03 17:04:21.000000000 +0100
-@@ -77,7 +77,7 @@ _M_ARCH=	$(_UNIQ)$(XM_ARCH)
- __M_ARCH=	$(_M_ARCH:$(_UNIQ)=$(K_ARCH))
- M_ARCH=		$(__M_ARCH:$(_UNIQ)%=%)
- 
--OSNAME:=	$(shell uname -s | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ, /\\()"' 'abcdefghijklmnopqrstuvwxyz,//////' | tr ',/' ',\-')
-+OSNAME:=	linux
- OSREL:=		$(shell uname -r | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ, /\\()"' 'abcdefghijklmnopqrstuvwxyz,//////' | tr ',/' ',\-')
- OSVERSION:=	$(shell uname -v | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ, /\\()"' 'abcdefghijklmnopqrstuvwxyz,//////' | tr ',/' ',\-')
- 
diff --git a/package/cdrtools/patches/patch-autoconf_configure b/package/cdrtools/patches/patch-autoconf_configure
deleted file mode 100644
index fdabf4c65..000000000
--- a/package/cdrtools/patches/patch-autoconf_configure
+++ /dev/null
@@ -1,47 +0,0 @@
---- cdrtools-3.01.orig/autoconf/configure	2011-11-22 22:45:22.000000000 +0100
-+++ cdrtools-3.01/autoconf/configure	2012-03-03 16:50:19.000000000 +0100
-@@ -1140,7 +1140,7 @@ else
- fi
- 
-   if test -z "$CC"; then
--    case "`uname -s`" in
-+    case "Linux" in
-     *win32* | *WIN32*)
-       # Extract the first word of "cl", so it can be a program name with args.
- set dummy cl; ac_word=$2
-@@ -1657,7 +1657,7 @@ hp_cc=cc
- hp_cc_ansi_opt=''
- ac_cv_hp_cc_ansi_opt=no
- if test "$GCC" != yes; then
--	os_name=`(uname -s) 2> /dev/null`
-+	os_name=Linux
- 	if test ."$os_name" = .HP-UX ; then
- 		ac_err=`< /dev/null eval $hp_cc -Ae -c 2>&1 | grep 'Bundled.*option is available only'`
- 		if test -n "$ac_err"; then
-@@ -1684,7 +1684,7 @@ hp_cc=cc
- hp_cc_opt_opt=''
- ac_cv_hp_cc_opt_opt=no
- if test "$GCC" != yes; then
--	os_name=`(uname -s) 2> /dev/null`
-+	os_name=Linux
- 	if test ."$os_name" = .HP-UX ; then
- 		ac_err=`< /dev/null eval $hp_cc -O -c 2>&1 | grep 'Bundled.*option is available only'`
- 		if test -n "$ac_err"; then
-@@ -1711,7 +1711,7 @@ hp_cc=cc
- hp_cc_gprof_opt=''
- ac_cv_hp_cc_gprof_opt=no
- if test "$GCC" != yes; then
--	os_name=`(uname -s) 2> /dev/null`
-+	os_name=Linux
- 	if test ."$os_name" = .HP-UX ; then
- 		ac_err=`< /dev/null eval $hp_cc -O -c 2>&1 | grep 'Bundled.*option is available only'`
- 		if test -n "$ac_err"; then
-@@ -21121,7 +21121,7 @@ fi
- done
- 
- 
--UNAME=`uname || true`
-+UNAME=Linux
- 
- if test ."$UNAME" = .Linux; then
- 
diff --git a/package/cdrtools/patches/patch-conf_oarch_sh b/package/cdrtools/patches/patch-conf_oarch_sh
deleted file mode 100644
index e5b1c2ca5..000000000
--- a/package/cdrtools/patches/patch-conf_oarch_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- cdrtools-3.01.orig/conf/oarch.sh	2009-10-31 21:03:00.000000000 +0100
-+++ cdrtools-3.01/conf/oarch.sh	2012-03-03 16:41:00.000000000 +0100
-@@ -92,7 +92,7 @@ if [ ."${XM_ARCH}" = . ]; then
- 	M_ARCH="${K_ARCH}"
- fi
- 
--OSNAME=`uname -s | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ, /\\()"' 'abcdefghijklmnopqrstuvwxyz,//////' | tr ',/' ',\-'`
-+OSNAME=linux
- OSHOST=`uname -n | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ, /\\()"' 'abcdefghijklmnopqrstuvwxyz,//////' | tr ',/' ',\-'`
- OSREL=`uname -r | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ, /\\()"' 'abcdefghijklmnopqrstuvwxyz,//////' | tr ',/' ',\-'`
- OSVERS=`uname -v | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ, /\\()"' 'abcdefghijklmnopqrstuvwxyz,//////' | tr ',/' ',\-'`