summaryrefslogtreecommitdiff
path: root/glib-2.0/glib-2.0-2.2.3
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-12-09 09:47:41 +0000
committerChris Larson <clarson@kergoth.com>2004-12-09 09:47:41 +0000
commit2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 (patch)
treebf879bea7ef8517ba8c3d1286ef300401d3d484c /glib-2.0/glib-2.0-2.2.3
parent101e2f1623def0a355d20aacb8bd93810703e834 (diff)
Merge oe-devel@oe-devel.bkbits.net:openembedded
into hyperion.kergoth.com:/home/kergoth/code/openembedded 2004/12/09 03:39:39-06:00 kergoth.com!kergoth Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit. BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA
Diffstat (limited to 'glib-2.0/glib-2.0-2.2.3')
-rw-r--r--glib-2.0/glib-2.0-2.2.3/automake-lossage.patch43
-rw-r--r--glib-2.0/glib-2.0-2.2.3/configure.patch174
-rw-r--r--glib-2.0/glib-2.0-2.2.3/glibconfig-sysdefs.h6
3 files changed, 0 insertions, 223 deletions
diff --git a/glib-2.0/glib-2.0-2.2.3/automake-lossage.patch b/glib-2.0/glib-2.0-2.2.3/automake-lossage.patch
deleted file mode 100644
index 02e9b5f25e..0000000000
--- a/glib-2.0/glib-2.0-2.2.3/automake-lossage.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- glib-2.2.3/gobject/Makefile.am.old 2004-03-06 20:48:33.000000000 +0000
-+++ glib-2.2.3/gobject/Makefile.am 2004-03-06 20:50:58.000000000 +0000
-@@ -87,7 +87,7 @@
- gobject_private_h_sources = @STRIP_BEGIN@ \
- @STRIP_END@
- # GObject library C sources to build the library from
--gobject_c_sources = @STRIP_BEGIN@ \
-+gobject_c_sources = \
- gboxed.c \
- gclosure.c \
- genums.c \
-@@ -102,8 +102,7 @@
- gvalue.c \
- gvaluearray.c \
- gvaluetransform.c \
-- gvaluetypes.c \
--@STRIP_END@
-+ gvaluetypes.c
-
- # we use our own built_sources variable rules to avoid automake's
- # BUILT_SOURCES oddities
-@@ -135,9 +134,9 @@
- #
- gobject_target_headers = $(gobject_public_h_sources) $(gobject_built_public_sources)
- gobject_target_sources = $(gobject_c_sources)
--MAINTAINERCLEANFILES += $(gobject_built_sources)
--EXTRA_HEADERS +=
--EXTRA_DIST += $(gobject_private_h_sources) $(gobject_extra_sources)
-+MAINTAINERCLEANFILES = $(gobject_built_sources)
-+EXTRA_HEADERS =
-+EXTRA_DIST = $(gobject_private_h_sources) $(gobject_extra_sources)
- EXTRA_DIST += $(gobject_built_sources)
-
- #
-@@ -145,7 +144,7 @@
- #
- # setup autogeneration dependancies
- gen_sources = xgen-gmh xgen-gmc xgen-gms
--CLEANFILES += $(gen_sources)
-+CLEANFILES = $(gen_sources)
-
- $(libgobject_2_0_la_OBJECTS): $(gobject_built_sources) ${gobject_built_public_sources} # this is our oldest file, used for implicit auto-generation deps
- # initial creation of the real stamp-* files
diff --git a/glib-2.0/glib-2.0-2.2.3/configure.patch b/glib-2.0/glib-2.0-2.2.3/configure.patch
deleted file mode 100644
index f6a04e34c5..0000000000
--- a/glib-2.0/glib-2.0-2.2.3/configure.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- glib-2.1.3/configure.in~configure
-+++ glib-2.1.3/configure.in
-@@ -15,7 +15,9 @@
- cflags_set=${CFLAGS+set}
-
- # we rewrite this file
-+if "x$cross_compiling" != xyes; then
- rm -f glibconfig-sysdefs.h
-+fi
-
- GLIB_AC_DIVERT_BEFORE_HELP([
- #
-@@ -402,10 +404,13 @@
- fi
- fi
-
-+AC_CHECK_LIBM
-+LIBS="$LIBS $LIBM"
-+
- dnl DU4 native cc currently needs -std1 for ANSI mode (instead of K&R)
- AC_MSG_CHECKING([for extra flags to get ANSI library prototypes])
- glib_save_LIBS=$LIBS
--LIBS="$LIBS -lm"
-+#LIBS="$LIBS -lm"
- AC_TRY_RUN([#include <math.h>
- int main (void) { return (log(1) != log(1.)); }],
- AC_MSG_RESULT(none needed),
-@@ -417,8 +422,10 @@
- AC_MSG_RESULT()
- CFLAGS=$glib_save_CFLAGS
- AC_MSG_WARN(
-- [No ANSI prototypes found in library. (-std1 didn't work.)])
-- )
-+ [No ANSI prototypes found in library. (-std1 didn't work.)]),
-+ AC_MSG_RESULT()
-+ ),
-+ AC_MSG_RESULT([assuming none needed])
- )
- LIBS=$glib_save_LIBS
-
-@@ -844,18 +851,18 @@
- dnl *** strlcpy/strlcat ***
- dnl ****************************************
- # Check for strlcpy
--AC_MSG_CHECKING(for OpenBSD strlcpy/strlcat)
--AC_TRY_RUN([
--#include <string.h>
--int main() {
-- char *p = malloc (10);
-- (void) strlcpy (p, "hi", 10);
-- if (strlcat (p, "bye", 0) != 3)
-- exit (1);
-- return 0;
--}], glib_ok=yes, glib_ok=no)
--AC_MSG_RESULT($glib_ok)
--if test "$glib_ok" = "yes"; then
-+AC_CACHE_CHECK([for OpenBSD strlcpy/strlcat],[glib_cv_strlcpy],
-+ AC_TRY_RUN([
-+ #include <string.h>
-+ int main() {
-+ char *p = malloc (10);
-+ (void) strlcpy (p, "hi", 10);
-+ if (strlcat (p, "bye", 0) != 3)
-+ exit (1);
-+ return 0;
-+ }], glib_cv_strlcpy=yes, glib_cv_strlcpy=no)
-+)
-+if test "x$glib_cv_strlcpy" = xyes; then
- AC_DEFINE(HAVE_STRLCPY,1,[Have functions strlcpy and strlcat])
- fi
-
-@@ -1302,16 +1309,15 @@
- for flag in pthread pthreads; do
- glib_save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -$flag"
-- AC_TRY_RUN([#include <pthread.h>
-+ AC_TRY_LINK([#include <pthread.h>],[
- int check_me = 0;
- void* func(void* data) {return check_me = 42;}
-- main()
-- { pthread_t t;
-+ pthread_t t;
- void *ret;
- pthread_create (&t, 0, func, 0);
- pthread_join (t, &ret);
- exit (check_me != 42 || ret != 42);
-- }],
-+ ],
- [G_THREAD_CFLAGS=-$flag
- G_THREAD_LIBS=-$flag])
- CFLAGS="$glib_save_CFLAGS"
-@@ -1431,16 +1437,15 @@
- LIBS="$glib_save_LIBS $add_thread_lib"
-
- AC_MSG_CHECKING(for pthread_create/pthread_join$IN)
-- AC_TRY_RUN([#include <pthread.h>
-+ AC_TRY_LINK([#include <pthread.h>],[
- int check_me = 0;
- void* func(void* data) {check_me = 42;}
-- main()
-- { pthread_t t;
-+ pthread_t t;
- void *ret;
- pthread_create (&t, $defattr, func, 0);
- pthread_join (t, &ret);
- exit (check_me != 42);
-- }],
-+ ],
- [AC_MSG_RESULT(yes)
- G_THREAD_LIBS="$add_thread_lib"
- break],
-@@ -1466,12 +1471,11 @@
- LIBS="$glib_save_LIBS $add_thread_lib"
-
- AC_MSG_CHECKING(for sched_get_priority_min$IN)
-- AC_TRY_RUN([#include <sched.h>
-- #include <errno.h>
-- int main() {
-+ AC_TRY_LINK([#include <sched.h>
-+ #include <errno.h>],[
- errno = 0;
- return sched_get_priority_min(SCHED_OTHER)==-1
-- && errno != 0;}],
-+ && errno != 0;],
- [AC_MSG_RESULT(yes)
- G_THREAD_LIBS="$G_THREAD_LIBS $add_thread_lib"
- posix_priority_min="sched_get_priority_min(SCHED_OTHER)"
-@@ -1636,7 +1640,8 @@
- AC_DEFINE_UNQUOTED(POSIX_YIELD_FUNC,$posix_yield_func,[The POSIX RT yield function])
- CPPFLAGS="$glib_save_CPPFLAGS"
-
-- AC_MSG_CHECKING(whether to use the PID niceness surrogate for thread priorities)
-+ AC_CACHE_CHECK([whether to use the PID niceness surrogate for thread priorities],
-+ [glib_cv_sys_use_pid_niceness_surrogate],
- AC_TRY_RUN([#include <pthread.h>
- #include <sys/types.h>
- #include <unistd.h>
-@@ -1651,10 +1656,12 @@
- exit (getpid()==other_pid ||
- $posix_priority_min != $posix_priority_max);
- }],
-- [AC_MSG_RESULT(yes)
-- AC_DEFINE(G_THREAD_USE_PID_SURROGATE, 1, [whether to use the PID niceness surrogate for thread priorities])
-- ],
-- [AC_MSG_RESULT(no)])
-+ [ glib_cv_sys_use_pid_niceness_surrogate=yes ],
-+ [ glib_cv_sys_use_pid_niceness_surrogate=no ])
-+ )
-+ if test x"$glib_cv_sys_use_pid_niceness_surrogate" = xyes; then
-+ AC_DEFINE(G_THREAD_USE_PID_SURROGATE, 1, [whether to use the PID niceness surrogate for thread priorities])
-+ fi
- elif test x"$have_threads" = xwin32; then
- # It's a pointer to a private struct
- GLIB_SIZEOF(,struct _GThreadData *, system_thread)
-@@ -1717,12 +1724,14 @@
- dnl ****************************************
- dnl *** GLib POLL* compatibility defines ***
- dnl ****************************************
-+if test x"$cross_compiling" != xyes; then
- GLIB_SYSDEFS(
- [#include <sys/types.h>
- #include <sys/poll.h>],
- POLLIN:1 POLLOUT:4 POLLPRI:2 POLLERR:8 POLLHUP:16 POLLNVAL:32,
- glibconfig-sysdefs.h,
- =)
-+fi
-
- dnl **********************
- dnl *** Win32 API libs ***
diff --git a/glib-2.0/glib-2.0-2.2.3/glibconfig-sysdefs.h b/glib-2.0/glib-2.0-2.2.3/glibconfig-sysdefs.h
deleted file mode 100644
index 1329e7f21c..0000000000
--- a/glib-2.0/glib-2.0-2.2.3/glibconfig-sysdefs.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#define GLIB_SYSDEF_POLLIN =1
-#define GLIB_SYSDEF_POLLOUT =4
-#define GLIB_SYSDEF_POLLPRI =2
-#define GLIB_SYSDEF_POLLERR =8
-#define GLIB_SYSDEF_POLLHUP =16
-#define GLIB_SYSDEF_POLLNVAL =32