Browse Source

Merge branch 'master' of git+ssh://openadk.org/git/openadk

Waldemar Brodkorb 14 years ago
parent
commit
7e7a9a7fdc
2 changed files with 24 additions and 2 deletions
  1. 22 0
      package/busybox/patches/004-remove-cflags.patch
  2. 2 2
      package/perl/Makefile

+ 22 - 0
package/busybox/patches/004-remove-cflags.patch

@@ -0,0 +1,22 @@
+diff -Nur busybox-1.18.1.orig/Makefile.flags busybox-1.18.1/Makefile.flags
+--- busybox-1.18.1.orig/Makefile.flags	2010-12-20 01:41:26.000000000 +0100
++++ busybox-1.18.1/Makefile.flags	2011-01-27 21:24:51.000000000 +0100
+@@ -57,18 +57,6 @@
+ # be fixed..
+ #CFLAGS += $(call cc-option,-Wconversion,)
+ 
+-ifneq ($(CONFIG_DEBUG),y)
+-CFLAGS += $(call cc-option,-Os,)
+-else
+-CFLAGS += $(call cc-option,-g,)
+-#CFLAGS += "-D_FORTIFY_SOURCE=2"
+-ifeq ($(CONFIG_DEBUG_PESSIMIZE),y)
+-CFLAGS += $(call cc-option,-O0,)
+-else
+-CFLAGS += $(call cc-option,-Os,)
+-endif
+-endif
+-
+ # If arch/$(ARCH)/Makefile did not override it (with, say, -fPIC)...
+ ARCH_FPIC ?= -fpic
+ ARCH_FPIE ?= -fpie

+ 2 - 2
package/perl/Makefile

@@ -6,7 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		perl
 PKG_VERSION:=		5.12.2
 PKG_RELEASE:=		2
-PKG_MD5SUM:=		af2df531d46b77fdf0d97eecb03eddb2
+PKG_MD5SUM:=		20781ca125fb6346bb343a15e082d127
 PKG_DESCR:=		full-blown Perl
 PKG_SECTION:=		lang
 PKG_URL:=		http://www.perl.org/
@@ -21,7 +21,7 @@ $(eval $(call PKG_template,PERL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_
 CONFIG_STYLE:=          manual
 
 pre-configure:
-	(cd ${WRKBUILD}; ./Configure -des -Dcc=gcc -Dprefix=/usr);
+	(cd ${WRKBUILD}; ./Configure -des -Dcc=gcc -Dprefix=/usr -A ccflags="${TARGET_CFLAGS}");
 
 post-install:
 	${INSTALL_DIR} ${IDIR_PERL}/usr/bin