From 04301296d2b446836e2d96fb4d0b867aaf02913e Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 26 Oct 2013 23:39:35 +0200 Subject: fix runtime problem with STRCSTR, found via the better error logging of musl's library loader --- package/ruby-ldap/Makefile | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'package/ruby-ldap/Makefile') diff --git a/package/ruby-ldap/Makefile b/package/ruby-ldap/Makefile index 8f26ca0ef..6289c1cb8 100644 --- a/package/ruby-ldap/Makefile +++ b/package/ruby-ldap/Makefile @@ -24,17 +24,19 @@ CONFIG_STYLE:= manual FAKE_FLAGS+= DESTDIR="/" do-configure: - (cd $(WRKBUILD) && $(STAGING_DIR)/bin/ruby -I$(STAGING_DIR)/usr/lib/ruby/1.9.1/$(CPU_ARCH)-linux/ extconf.rb \ + (cd $(WRKBUILD) && $(STAGING_HOST_DIR)/usr/bin/ruby -I$(STAGING_DIR)/usr/lib/ruby/2.0.0/$(CPU_ARCH)-linux/ extconf.rb \ --with-openldap2 \ + --without-libnsl \ + --with-ldap-dir=$(STAGING_DIR)/usr \ --with-ldap-lib=$(STAGING_DIR)/usr/lib \ --with-ldap-include=$(STAGING_DIR)/usr/include) ruby-ldap-install: - $(INSTALL_DIR) $(IDIR_RUBY_LDAP)/usr/lib/ruby/site_ruby/1.9.1/$(CPU_ARCH)-linux - $(INSTALL_DIR) $(IDIR_RUBY_LDAP)/usr/lib/ruby/site_ruby/1.9.1/ldap - $(CP) $(STAGING_DIR)/usr/lib/ruby/site_ruby/1.9.1/$(CPU_ARCH)-linux/ldap.so \ - $(IDIR_RUBY_LDAP)/usr/lib/ruby/site_ruby/1.9.1/$(CPU_ARCH)-linux - $(CP) $(STAGING_DIR)//usr/lib/ruby/site_ruby/1.9.1/ldap/*.rb \ - $(IDIR_RUBY_LDAP)/usr/lib/ruby/site_ruby/1.9.1/ldap + $(INSTALL_DIR) $(IDIR_RUBY_LDAP)/usr/lib/ruby/site_ruby/2.0.0/$(CPU_ARCH)-linux + $(INSTALL_DIR) $(IDIR_RUBY_LDAP)/usr/lib/ruby/site_ruby/2.0.0/ldap + $(CP) $(STAGING_DIR)/usr/lib/ruby/site_ruby/2.0.0/$(CPU_ARCH)-linux/ldap.so \ + $(IDIR_RUBY_LDAP)/usr/lib/ruby/site_ruby/2.0.0/$(CPU_ARCH)-linux + $(CP) $(STAGING_DIR)//usr/lib/ruby/site_ruby/2.0.0/ldap/*.rb \ + $(IDIR_RUBY_LDAP)/usr/lib/ruby/site_ruby/2.0.0/ldap include ${TOPDIR}/mk/pkg-bottom.mk -- cgit v1.2.3 From 2d5110b0f579df83c3f310aacb9dd4c575423233 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 13 Nov 2013 14:20:38 +0100 Subject: disable for avr32, gcc ICE --- package/ruby-ldap/Makefile | 2 ++ package/ruby/Makefile | 1 + 2 files changed, 3 insertions(+) (limited to 'package/ruby-ldap/Makefile') diff --git a/package/ruby-ldap/Makefile b/package/ruby-ldap/Makefile index 6289c1cb8..9d063331a 100644 --- a/package/ruby-ldap/Makefile +++ b/package/ruby-ldap/Makefile @@ -14,6 +14,8 @@ PKG_BUILDDEP:= ruby openldap PKG_URL:= http://ruby-ldap.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=ruby-ldap/0.9.8/} +PKG_ARCH_DEPENDS:= !avr32 + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include $(TOPDIR)/mk/package.mk diff --git a/package/ruby/Makefile b/package/ruby/Makefile index cc34e7e5d..bf25e2236 100644 --- a/package/ruby/Makefile +++ b/package/ruby/Makefile @@ -17,6 +17,7 @@ PKG_SITES:= http://ftp.ruby-lang.org/pub/ruby/2.0/ PKG_NOPARALLEL:= 1 PKG_HOST_DEPENDS:= !freebsd !cygwin +PKG_ARCH_DEPENDS:= !avr32 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-p${PKG_EXTRAVER}.tar.gz WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION}-p${PKG_EXTRAVER} -- cgit v1.2.3