Update a few packages

This commit is contained in:
Eric Andersen
2004-10-14 09:39:25 +00:00
parent e2578ec3c5
commit c3da0d8281
19 changed files with 68 additions and 51 deletions

View File

@@ -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

View File

@@ -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