From 7162d597bf52b0a10f94fe5b205848c5c8f19018 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 14 Nov 2011 14:06:14 +0100
Subject: unbreak building

---
 package/ruby/Makefile | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'package/ruby')

diff --git a/package/ruby/Makefile b/package/ruby/Makefile
index 03494272b..ea2159d1c 100644
--- a/package/ruby/Makefile
+++ b/package/ruby/Makefile
@@ -24,23 +24,19 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,RUBY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 MAKE_FILE:=		GNUmakefile
-XAKE_FLAGS+=		optflags='' debugflags='' BASERUBY="${WRKBUILD}/hostruby" \
-			dldflags="$(TARGET_LDFLAGS)" 
+XAKE_FLAGS+=		optflags='' debugflags='' dldflags="$(TARGET_LDFLAGS)" 
 # uClibc setpgrp does not take arguments
-CONFIGURE_ENV+=         ac_cv_func_setpgrp_void=yes 
-CONFIGURE_ARGS+=	--disable-install-doc
+CONFIGURE_ENV+=         ac_cv_func_setpgrp_void=yes rb_cv_binary_elf=yes
+CONFIGURE_ARGS+=	--disable-install-doc --with-baseruby=${WRKBUILD}/hostruby
 ALL_TARGET:=		main
 INSTALL_TARGET:=	install-nodoc
 
 pre-configure:
-	cp ${WRKBUILD}/ext/Setup ${WRKBUILD}/ext/Setup.orig
-	echo "option nodynamic" >> ${WRKBUILD}/ext/Setup
 	(cd ${WRKBUILD}; rm -rf config.{cache,status} ; \
-		LDSHARED="${CC} -shared" DLDFLAGS="-fPIC" CFLAGS="-fPIC" ./configure --prefix=$(STAGING_HOST_DIR) --disable-install-doc \
+		rb_cv_binary_elf=yes ./configure --prefix=$(STAGING_HOST_DIR) --disable-install-doc \
 	);
-	$(MAKE) -C ${WRKBUILD} main Q=""
+	-$(MAKE) -C ${WRKBUILD} main Q=""
 	cp ${WRKBUILD}/ruby ${WRKBUILD}/hostruby
-	cp ${WRKBUILD}/ext/Setup.orig ${WRKBUILD}/ext/Setup
 	$(MAKE) -C ${WRKBUILD} install-nodoc
 	$(MAKE) -C ${WRKBUILD} clean
 
-- 
cgit v1.2.3