* Remove bogus tab in libcgi.mk that prevented the library from being build

* Added headerfiles to STAGING_DIR in usr/include/libcgi so that we
  can actually use the library with the toolchain
* Added patch that fixes up the makefile.in and fixes a few bugs in libcgi
* rm the target-dir's so* in libcgi-clean

Most of the patch has been taken from the debian package.

Thanks to Lars Munch.
This commit is contained in:
Bernhard Reutner-Fischer
2006-12-12 13:16:31 +00:00
parent 5eeac710ca
commit 51dd2d4a8b
2 changed files with 119 additions and 6 deletions

View File

@@ -15,6 +15,7 @@ $(DL_DIR)/$(LIBCGI_SOURCE):
$(LIBCGI_DIR)/.source: $(DL_DIR)/$(LIBCGI_SOURCE)
$(ZCAT) $(DL_DIR)/$(LIBCGI_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(LIBCGI_DIR) package/libcgi/ libcgi\*.patch
touch $(LIBCGI_DIR)/.source
$(LIBCGI_DIR)/.configured: $(LIBCGI_DIR)/.source
@@ -25,7 +26,7 @@ $(LIBCGI_DIR)/.configured: $(LIBCGI_DIR)/.source
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
--prefix=/usr \
--prefix=$(STAGING_DIR) \
--sysconfdir=/etc \
);
touch $(LIBCGI_DIR)/.configured;
@@ -33,16 +34,19 @@ $(LIBCGI_DIR)/.configured: $(LIBCGI_DIR)/.source
$(LIBCGI_DIR)/$(LIBCGI_LIBRARY): $(LIBCGI_DIR)/.configured
$(MAKE) CC=$(TARGET_CC) -C $(LIBCGI_DIR)
$(TARGET_DIR)/$(LIBCGI_TARGET_LIBRARY): $(LIBCGI_DIR)/$(LIBCGI_LIBRARY)
cp $(LIBCGI_DIR)/src/libcgi.so $(TARGET_DIR)/usr/lib/
$(STAGING_DIR)/lib/libcgi.so: $(LIBCGI_DIR)/$(LIBCGI_LIBRARY)
$(MAKE) -C $(LIBCGI_DIR) install
touch -c $(STAGING_DIR)/lib/libcgi.so
$(TARGET_DIR)/$(LIBCGI_TARGET_LIBRARY): $(STAGING_DIR)/lib/libcgi.so
cp -dpf $(STAGING_DIR)/lib/libcgi.so* $(TARGET_DIR)/usr/lib/
libcgi: uclibc $(TARGET_DIR)/$(LIBCGI_TARGET_LIBRARY)
libcgi-source: $(DL_DIR)/$(LIBCGI_SOURCE)
libcgi-clean:
rm $(TARGET_DIR)/usr/lib/libcgi.so
rm $(TARGET_DIR)/usr/lib/libcgi.so*
-$(MAKE) -C $(LIBCGI_DIR) clean
libcgi-dirclean:
@@ -54,6 +58,6 @@ libcgi-dirclean:
#
#############################################################
ifeq ($(strip $(BR2_PACKAGE_LIBCGI)),y)
TARGETS+=libcgi
TARGETS+=libcgi
endif