From 9436a026e2e23d207fbdcb9e8bc9b076e3573700 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 22 Jan 2011 22:37:50 +0100
Subject: activate GCC cflags check, cleanup FLAGS stuff in OpenADK.

 * remove TCFLAGS/TLDFLAGS/TCPPFLAGS and only use
   TARGET_CFLAGS/TARGET_LDFLAGS/TARGET_CPPFLAGS, ...
 * activate GCC_HONOUR_COPTS and fix all packages to
   honour CFLAGS
 * use CC_FOR_BUILD, CFLAGS_FOR_BUILD, ... for all
   build compilation, remove HOST* variants
 * introduce KERNEL_MODULE_FLAGS for external kernel
   modules
 * mark rpm package as broken, mark syslinux for native builds
   only, mark libhugetlb for eglibc/glibc only usage
---
 package/rpm/Makefile                |  7 ++++---
 package/rpm/patches/patch-configure | 11 +++++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 package/rpm/patches/patch-configure

(limited to 'package/rpm')

diff --git a/package/rpm/Makefile b/package/rpm/Makefile
index 5c23deb71..566b56251 100644
--- a/package/rpm/Makefile
+++ b/package/rpm/Makefile
@@ -4,14 +4,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		rpm
-PKG_VERSION:=		5.3.3
+PKG_VERSION:=		5.3.5
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		08027af2368ecad8060f9f5bf46c2bd9
+PKG_MD5SUM:=		7a5112fd208bfda7a1cab20b9ce17a02
 PKG_DESCR:=		Package Manager
 PKG_SECTION:=		base
 PKG_URL:=		http://www.rpm.org/
 PKG_SITES:=		http://rpm5.org/files/rpm/rpm-5.3/
 
+PKG_CFLINE_RPM:=	depends on ADK_BROKEN
 PKG_HOST_DEPENDS:=	!cygwin !darwin
 PKG_ARCH_DEPENDS:=	!cris
 
@@ -22,7 +23,7 @@ $(eval $(call PKG_template,RPM,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_D
 CONFIGURE_ENV+=		ac_cv_va_copy=no
 CONFIGURE_ARGS+=	--with-usecrypto=BeeCrypt \
 			--with-beecrypt=internal \
-			--with-dbapi=db \
+			--with-db=external \
 			--with-sqlite=none \
 			--without-python \
 			--without-perl \
diff --git a/package/rpm/patches/patch-configure b/package/rpm/patches/patch-configure
new file mode 100644
index 000000000..e5e2a854c
--- /dev/null
+++ b/package/rpm/patches/patch-configure
@@ -0,0 +1,11 @@
+--- rpm-5.3.5.orig/configure	2010-10-25 18:35:18.000000000 +0200
++++ rpm-5.3.5/configure	2011-01-21 22:37:21.147399617 +0100
+@@ -17673,7 +17673,7 @@ if test "${enable_build_debug+set}" = se
+ fi
+ 
+ if test ".`$CC --version 2>&1 | grep 'GCC'`" != .; then
+- for c in -fno-delete-null-pointer-checks -D_FORTIFY_SOURCE=2 -fstack-protector -fexceptions -fnested-functions
++ for c in -fno-delete-null-pointer-checks -D_FORTIFY_SOURCE=2 -fexceptions -fnested-functions
+  do
+  my_save_cflags="$CFLAGS"
+  CFLAGS=$c
-- 
cgit v1.2.3