mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-09-30 22:11:59 -09:00
Update a few packages
This commit is contained in:
@@ -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
|
||||
|
||||
25
package/libglib12/libglib_gcc3-patch
Normal file
25
package/libglib12/libglib_gcc3-patch
Normal 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
|
||||
Reference in New Issue
Block a user