summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2003-09-04 08:15:44 +0000
committerEric Andersen <andersen@codepoet.org>2003-09-04 08:15:44 +0000
commit47c35f2fc0de9960be93187c1db4be0b60126ea7 (patch)
tree04c62521461ea5e8c93a5a0278db6d80bc91cd55
parenta9ade645c665ca1faf53937f63e30bcba2748f50 (diff)
downloadbuildroot-novena-47c35f2fc0de9960be93187c1db4be0b60126ea7.tar.gz
buildroot-novena-47c35f2fc0de9960be93187c1db4be0b60126ea7.zip
teach glib to cross compile
-rw-r--r--make/libglib12.mk22
-rw-r--r--sources/libglib_configure_1.2.10.bz2bin0 -> 8884 bytes
2 files changed, 19 insertions, 3 deletions
diff --git a/make/libglib12.mk b/make/libglib12.mk
index 75bb38e7a..f6211ee10 100644
--- a/make/libglib12.mk
+++ b/make/libglib12.mk
@@ -7,7 +7,9 @@ LIBGLIB12_SOURCE:=glib-1.2.10.tar.gz
LIBGLIB12_SITE:=ftp://ftp.gtk.org/pub/gtk/v1.2
LIBGLIB12_CAT:=zcat
LIBGLIB12_DIR:=$(BUILD_DIR)/glib-1.2.10
-LIBGLIB12_BINARY:=libglib-1.2.so.0.0.10
+LIBGLIB12_BINARY:=libglib.a
+LIBGLIB12_PATCH:=$(SOURCE_DIR)/libglib_configure_1.2.10.bz2
+
$(DL_DIR)/$(LIBGLIB12_SOURCE):
$(WGET) -P $(DL_DIR) $(LIBGLIB12_SITE)/$(LIBGLIB12_SOURCE)
@@ -16,6 +18,7 @@ libglib12-source: $(DL_DIR)/$(LIBGLIB12_SOURCE)
$(LIBGLIB12_DIR)/.unpacked: $(DL_DIR)/$(LIBGLIB12_SOURCE)
$(LIBGLIB12_CAT) $(DL_DIR)/$(LIBGLIB12_SOURCE) | tar -C $(BUILD_DIR) -xvf -
+ bzcat $(LIBGLIB12_PATCH) | patch -p1 -d $(LIBGLIB12_DIR)
touch $(LIBGLIB12_DIR)/.unpacked
$(LIBGLIB12_DIR)/.configured: $(LIBGLIB12_DIR)/.unpacked
@@ -24,7 +27,6 @@ $(LIBGLIB12_DIR)/.configured: $(LIBGLIB12_DIR)/.unpacked
./configure \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
--prefix=/usr \
--exec-prefix=/usr \
--bindir=/usr/bin \
@@ -44,7 +46,21 @@ $(LIBGLIB12_DIR)/.libs/$(LIBGLIB12_BINARY): $(LIBGLIB12_DIR)/.configured
$(MAKE) CC=$(TARGET_CC) -C $(LIBGLIB12_DIR)
$(STAGING_DIR)/lib/$(LIBGLIB12_BINARY): $(LIBGLIB12_DIR)/.libs/$(LIBGLIB12_BINARY)
- $(MAKE) CC=$(TARGET_CC) prefix=$(STAGING_DIR) -C $(LIBGLIB12_DIR) install
+ $(MAKE) prefix=$(STAGING_DIR) \
+ exec_prefix=$(STAGING_DIR) \
+ bindir=$(STAGING_DIR)/bin \
+ sbindir=$(STAGING_DIR)/sbin \
+ libexecdir=$(STAGING_DIR)/libexec \
+ datadir=$(STAGING_DIR)/share \
+ sysconfdir=$(STAGING_DIR)/etc \
+ sharedstatedir=$(STAGING_DIR)/com \
+ localstatedir=$(STAGING_DIR)/var \
+ libdir=$(STAGING_DIR)/lib \
+ includedir=$(STAGING_DIR)/include \
+ oldincludedir=$(STAGING_DIR)/include \
+ infodir=$(STAGING_DIR)/info \
+ mandir=$(STAGING_DIR)/man \
+ -C $(LIBGLIB12_DIR) install;
$(TARGET_DIR)/lib/$(LIBGLIB12_BINARY): $(STAGING_DIR)/lib/$(LIBGLIB12_BINARY)
cp -a $(STAGING_DIR)/lib/$(LIBGLIB12_BINARY) $(TARGET_DIR)/lib/
diff --git a/sources/libglib_configure_1.2.10.bz2 b/sources/libglib_configure_1.2.10.bz2
new file mode 100644
index 000000000..883a8009d
--- /dev/null
+++ b/sources/libglib_configure_1.2.10.bz2
Binary files differ