From 6c6f200083c828448eab7cf3935a153abfc46e27 Mon Sep 17 00:00:00 2001 From: Ulf Samuelsson Date: Fri, 2 Nov 2007 22:37:58 +0000 Subject: Avoid autoconf, to allow libmad build to complete --- package/libmad/libmad.mk | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'package/libmad') diff --git a/package/libmad/libmad.mk b/package/libmad/libmad.mk index 4f3166e6f..5eeab9881 100644 --- a/package/libmad/libmad.mk +++ b/package/libmad/libmad.mk @@ -18,6 +18,8 @@ $(LIBMAD_DIR)/.unpacked: $(DL_DIR)/$(LIBMAD_SOURCE) $(CONFIG_UPDATE) $(LIBMAD_DIR) toolchain/patch-kernel.sh $(LIBMAD_DIR) package/libmad/ libmad-$(LIBMAD_VERSION)\*.patch toolchain/patch-kernel.sh $(LIBMAD_DIR) package/libmad/ libmad-$(LIBMAD_VERSION)\*.patch.$(ARCH) + # Prevent automake from running. + (cd $(LIBMAD_DIR); touch -c config* aclocal.m4 Makefile*); touch $@ $(LIBMAD_DIR)/.configured: $(LIBMAD_DIR)/.unpacked @@ -45,19 +47,22 @@ $(LIBMAD_DIR)/libmad.la: $(LIBMAD_DIR)/.configured (cd $(LIBMAD_DIR); libtoolize --force) $(MAKE) -C $(LIBMAD_DIR) -$(STAGING_DIR)/usr/lib/libmad.so: $(LIBMAD_DIR)/libmad.la +$(STAGING_DIR)/usr/lib/libmad.so.0: $(LIBMAD_DIR)/libmad.la $(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBMAD_DIR) install + $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libmad.la -$(TARGET_DIR)/usr/lib/libmad.so: $(STAGING_DIR)/usr/lib/libmad.so - cp -dpf $(STAGING_DIR)/usr/lib/libmad.so* $(TARGET_DIR)/usr/lib/ - $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libmad* +$(TARGET_DIR)/usr/lib/libmad.so.0: $(STAGING_DIR)/usr/lib/libmad.so.0 + cp -dpf $(STAGING_DIR)/usr/lib/libmad.so.* $(TARGET_DIR)/usr/lib/ + $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libmad.so.* -$(TARGET_DIR)/usr/lib/libmad.a: $(STAGING_DIR)/usr/lib/libmad.so +$(TARGET_DIR)/usr/lib/libmad.a: $(STAGING_DIR)/usr/lib/libmad.so.0 mkdir -p $(TARGET_DIR)/usr/include cp -dpf $(STAGING_DIR)/usr/include/mad.h $(TARGET_DIR)/usr/include/ - cp -dpf $(STAGING_DIR)/usr/lib/libmad.*a $(TARGET_DIR)/usr/lib/ + cp -dpf $(STAGING_DIR)/usr/lib/libmad.la $(TARGET_DIR)/usr/lib/ + cp -dpf $(STAGING_DIR)/usr/lib/libmad.so $(TARGET_DIR)/usr/lib/ + cp -dpf $(STAGING_DIR)/usr/lib/libmad.a $(TARGET_DIR)/usr/lib/ -libmad: uclibc $(TARGET_DIR)/usr/lib/libmad.so +libmad: uclibc $(TARGET_DIR)/usr/lib/libmad.so.0 libmad-headers: $(TARGET_DIR)/usr/lib/libmad.a -- cgit v1.2.3