diff options
| author | Eric Andersen <andersen@codepoet.org> | 2004-10-14 09:39:25 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2004-10-14 09:39:25 +0000 |
| commit | c3da0d8281e24ad8fa1af7e06a16330cc6b41eb3 (patch) | |
| tree | 042e86e5e8e26ebb24e55d1bc87beb29894ea884 /package/libglib12 | |
| parent | e2578ec3c5febb0670405896216ddbc73e4a8840 (diff) | |
Update a few packages
Diffstat (limited to 'package/libglib12')
| -rw-r--r-- | package/libglib12/libglib12.mk | 3 | ||||
| -rw-r--r-- | package/libglib12/libglib_configure-patch.bz2 (renamed from package/libglib12/libglib_configure_1.2.10.bz2) | bin | 8884 -> 8884 bytes | |||
| -rw-r--r-- | package/libglib12/libglib_gcc3-patch | 25 |
3 files changed, 26 insertions, 2 deletions
diff --git a/package/libglib12/libglib12.mk b/package/libglib12/libglib12.mk index 5d2235adc..587399cf9 100644 --- a/package/libglib12/libglib12.mk +++ b/package/libglib12/libglib12.mk @@ -8,7 +8,6 @@ LIBGLIB12_SITE:=ftp://ftp.gtk.org/pub/gtk/v1.2 LIBGLIB12_CAT:=zcat LIBGLIB12_DIR:=$(BUILD_DIR)/glib-1.2.10 LIBGLIB12_BINARY:=libglib.a -LIBGLIB12_PATCH:=libglib_configure_1.2.10.bz2 $(DL_DIR)/$(LIBGLIB12_SOURCE): @@ -18,7 +17,7 @@ libglib12-source: $(DL_DIR)/$(LIBGLIB12_SOURCE) $(LIBGLIB12_DIR)/.unpacked: $(DL_DIR)/$(LIBGLIB12_SOURCE) $(LIBGLIB12_CAT) $(DL_DIR)/$(LIBGLIB12_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(LIBGLIB12_DIR) package/libglib12/ $(LIBGLIB12_PATCH) + toolchain/patch-kernel.sh $(LIBGLIB12_DIR) package/libglib12/ *-patch* touch $(LIBGLIB12_DIR)/.unpacked $(LIBGLIB12_DIR)/.configured: $(LIBGLIB12_DIR)/.unpacked diff --git a/package/libglib12/libglib_configure_1.2.10.bz2 b/package/libglib12/libglib_configure-patch.bz2 Binary files differindex 883a8009d..883a8009d 100644 --- a/package/libglib12/libglib_configure_1.2.10.bz2 +++ b/package/libglib12/libglib_configure-patch.bz2 diff --git a/package/libglib12/libglib_gcc3-patch b/package/libglib12/libglib_gcc3-patch new file mode 100644 index 000000000..3a2b44d81 --- /dev/null +++ b/package/libglib12/libglib_gcc3-patch @@ -0,0 +1,25 @@ +--- glib-1.2.10/glib.orig.h 2004-10-14 01:11:45.000000000 -0600 ++++ glib-1.2.10/glib.h 2004-10-14 01:12:02.000000000 -0600 +@@ -271,14 +271,15 @@ + + /* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with + * macros, so we can refer to them as strings unconditionally. ++ * usage not-recommended since gcc-3.0 + */ +-#ifdef __GNUC__ +-#define G_GNUC_FUNCTION __FUNCTION__ +-#define G_GNUC_PRETTY_FUNCTION __PRETTY_FUNCTION__ +-#else /* !__GNUC__ */ +-#define G_GNUC_FUNCTION "" +-#define G_GNUC_PRETTY_FUNCTION "" +-#endif /* !__GNUC__ */ ++#if defined (__GNUC__) && (__GNUC__ < 3) ++#define G_GNUC_FUNCTION __FUNCTION__ ++#define G_GNUC_PRETTY_FUNCTION __PRETTY_FUNCTION__ ++#else /* !__GNUC__ */ ++#define G_GNUC_FUNCTION "" ++#define G_GNUC_PRETTY_FUNCTION "" ++#endif /* !__GNUC__ */ + + /* we try to provide a usefull equivalent for ATEXIT if it is + * not defined, but use is actually abandoned. people should |