Skip to contentSkip to conversation

fix libcgi building

PATCH New Lars Munch 2 participants 2 messages Dec 12, 2006

lore
Share & tools
lore

Lars Munch

author
#0 lore raw

PATCH 1/1 fix libcgi building

Hi all

The attached patch fixes af few issues with libcgi:

* 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

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

Please apply.

-- Lars Munch
-------------- next part --------------

package/libcgi/libcgi.mk +9 -4
Index: buildroot/package/libcgi/libcgi.mk
===================================================================
@@ -15,6 +15,7 @@
 
 $(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 @@
 			--target=$(GNU_TARGET_NAME) \
 			--host=$(GNU_TARGET_NAME) \
 			--build=$(GNU_HOST_NAME) \
-			--prefix=/usr \
+			--prefix=$(STAGING_DIR) \
 			--sysconfdir=/etc \
 	);
 	touch $(LIBCGI_DIR)/.configured;
@@ -33,9 +34,13 @@
 $(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)
@@ -54,6 +59,6 @@
 #
 #############################################################
 ifeq ($(strip $(BR2_PACKAGE_LIBCGI)),y)
-	TARGETS+=libcgi
+TARGETS+=libcgi
 endif
 
package/libcgi/libcgi.patch +109 -0

109 lines not on this page · raw message

#1 lore raw

PATCH 1/1 fix libcgi building

Quoted 4 lines · Lars Munch

Hi all

The attached patch fixes af few issues with libcgi:

Quoted 8 lines

* 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

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

Please apply.

Applied. Thanks!