From e874f84fdb6eb83d905a72b35d87398374594b97 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 5 Jun 2009 19:58:50 +0200
Subject: more regressions found at runtime on alic1c

---
 package/srelay/Makefile                       |  8 +++++---
 package/srelay/patches/01-cross_compile.patch |  6 +++---
 package/srelay/patches/patch-configure_in     | 20 ++++++++++++++++++++
 3 files changed, 28 insertions(+), 6 deletions(-)
 create mode 100644 package/srelay/patches/patch-configure_in

(limited to 'package/srelay')

diff --git a/package/srelay/Makefile b/package/srelay/Makefile
index f0065f3ff..4c3f09d5e 100644
--- a/package/srelay/Makefile
+++ b/package/srelay/Makefile
@@ -15,13 +15,15 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,SRELAY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-CONFIGURE_ARGS+=	--disable-thread
+CONFIGURE_STYLE:=	autoconf gnu
+CONFIGURE_ENV+=		ac_cv_lib_nsl_getaddrinfo=no
+CONFIGURE_ARGS+=	--disable-thread \
+			--with-libwrap=no
 BUILD_STYLE:=		auto
 
 do-install:
 	${INSTALL_DIR} ${IDIR_SRELAY}/usr/bin ${IDIR_SRELAY}/etc
-	${INSTALL_BIN} ${WRKBUILD}/srelay ${IDIR_SRELAY}/usr/bin/
 	${INSTALL_DATA} ./files/srelay.conf ${IDIR_SRELAY}/etc
+	${INSTALL_BIN} ${WRKBUILD}/srelay ${IDIR_SRELAY}/usr/bin
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/srelay/patches/01-cross_compile.patch b/package/srelay/patches/01-cross_compile.patch
index f4ff1e681..03d7fa215 100644
--- a/package/srelay/patches/01-cross_compile.patch
+++ b/package/srelay/patches/01-cross_compile.patch
@@ -1,7 +1,7 @@
 diff -urN srelay-0.4.6/configure srelay-0.4.6.new/configure
---- srelay-0.4.6/configure	2003-04-14 07:36:15.000000000 +0200
-+++ srelay-0.4.6.new/configure	2006-03-28 15:11:42.000000000 +0200
-@@ -1395,7 +1395,7 @@
+--- srelay-0.4.6.orig/configure	2003-04-14 07:36:15.000000000 +0200
++++ srelay-0.4.6/configure	2009-06-05 18:03:20.000000000 +0200
+@@ -1395,7 +1395,7 @@ _ACEOF
  	;;
    linux*)
  	case "$build_cpu" in
diff --git a/package/srelay/patches/patch-configure_in b/package/srelay/patches/patch-configure_in
new file mode 100644
index 000000000..46e2a9aeb
--- /dev/null
+++ b/package/srelay/patches/patch-configure_in
@@ -0,0 +1,20 @@
+--- srelay-0.4.6.orig/configure.in	2003-04-14 07:36:15.000000000 +0200
++++ srelay-0.4.6/configure.in	2009-06-05 18:11:26.000000000 +0200
+@@ -15,7 +15,7 @@ case "$build_os" in
+ 	;;
+   linux*)
+ 	case "$build_cpu" in
+-	  i*86)
++	  i*86 | mips* | powerpc* | sparc* | x86_64*)
+ 	    OS=LINUX
+ 	    AC_DEFINE(LINUX)
+ 	    ;;
+@@ -23,7 +23,7 @@ case "$build_os" in
+ 	;;
+ esac
+ 
+-CFLAGS="$CFLAGS -O2 -Wall"
++CFLAGS="$CFLAGS -Wall"
+ LDFLAGS="$LDFLAGS -s"
+ 
+ dnl Local libralies.
-- 
cgit v1.2.3