mirror of
https://git.yoctoproject.org/poky
synced 2026-04-17 09:32:12 +02:00
pkg-config: dropped 0.15
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2519 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
@@ -1,495 +0,0 @@
|
||||
|
||||
#
|
||||
# Patch managed by http://www.holgerschurig.de/patcher.html
|
||||
#
|
||||
|
||||
--- pkgconfig-0.15.0/glib-1.2.8/Makefile.am~configure.patch
|
||||
+++ pkgconfig-0.15.0/glib-1.2.8/Makefile.am
|
||||
@@ -65,7 +65,7 @@
|
||||
|
||||
CONFIGURE_DEPENDENCIES = acglib.m4
|
||||
|
||||
-BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h
|
||||
+BUILT_SOURCES += stamp-gc-h #note: not glibconfig.h
|
||||
glibconfig.h: stamp-gc-h
|
||||
@:
|
||||
stamp-gc-h: config.status
|
||||
--- pkgconfig-0.15.0/glib-1.2.8/configure.in~configure.patch
|
||||
+++ pkgconfig-0.15.0/glib-1.2.8/configure.in
|
||||
@@ -1,10 +1,11 @@
|
||||
dnl ***********************************
|
||||
dnl *** include special GLib macros ***
|
||||
dnl ***********************************
|
||||
-builtin(include, acglib.m4)dnl
|
||||
+dnl no need, just use aclocal -I . --CL
|
||||
+dnl builtin(include, acglib.m4)dnl
|
||||
|
||||
# require autoconf 2.13
|
||||
-AC_PREREQ(2.13)
|
||||
+AC_PREREQ(2.53)
|
||||
|
||||
# init autoconf (and check for presence of glist.c)
|
||||
AC_INIT(glist.c)
|
||||
@@ -13,11 +14,48 @@
|
||||
cflags_set=${CFLAGS+set}
|
||||
|
||||
# we rewrite this file
|
||||
+if test "x$cross_compiling" != "xyes"; then
|
||||
rm -f glibconfig-sysdefs.h
|
||||
+fi
|
||||
+
|
||||
+# config defines
|
||||
+
|
||||
+AH_TEMPLATE([ENABLE_MEM_CHECK],
|
||||
+ [Define if enabling memory checking])
|
||||
+AH_TEMPLATE([ENABLE_MEM_PROFILE], [])
|
||||
+AH_TEMPLATE([GLIB_BINARY_AGE], [])
|
||||
+AH_TEMPLATE([GLIB_BYTE_CONTENTS_GMUTEX], [])
|
||||
+AH_TEMPLATE([GLIB_INTERFACE_AGE], [])
|
||||
+AH_TEMPLATE([GLIB_MAJOR_VERSION], [])
|
||||
+AH_TEMPLATE([GLIB_MINOR_VERSION], [])
|
||||
+AH_TEMPLATE([GLIB_MICRO_VERSION], [])
|
||||
+AH_TEMPLATE([GLIB_SIZEOF_GMUTEX], [])
|
||||
+AH_TEMPLATE([G_COMPILED_WITH_DEBUGGING], [])
|
||||
+AH_TEMPLATE([G_HAVE_INLINE], [])
|
||||
+AH_TEMPLATE([G_HAVE___INLINE], [])
|
||||
+AH_TEMPLATE([G_HAVE___INLINE__], [])
|
||||
+AH_TEMPLATE([G_THREAD_SOURCE], [])
|
||||
+AH_TEMPLATE([G_VA_COPY], [])
|
||||
+AH_TEMPLATE([G_VA_COPY_AS_ARRAY], [])
|
||||
+AH_TEMPLATE([HAVE_BROKEN_WCTYPE], [])
|
||||
+AH_TEMPLATE([HAVE_GETPWUID_R], [])
|
||||
+AH_TEMPLATE([HAVE_GETPWUID_R_POSIX], [])
|
||||
+AH_TEMPLATE([HAVE_PTHREAD_COND_TIMEDWAIT_POSIX], [])
|
||||
+AH_TEMPLATE([HAVE_PTHREAD_GETSPECIFIC_POSIX], [])
|
||||
+AH_TEMPLATE([HAVE_PTHREAD_MUTEX_TRYLOCK_POSIX], [])
|
||||
+AH_TEMPLATE([HAVE_WCHAR_H], [])
|
||||
+AH_TEMPLATE([HAVE_WCTYPE_H], [])
|
||||
+AH_TEMPLATE([NO_FD_SET], [])
|
||||
+AH_TEMPLATE([NO_SYS_ERRLIST], [])
|
||||
+AH_TEMPLATE([NO_SYS_SIGLIST], [])
|
||||
+AH_TEMPLATE([NO_SYS_SIGLIST_DECL], [])
|
||||
+AH_TEMPLATE([REALLOC_0_WORKS], [])
|
||||
+
|
||||
|
||||
dnl we need to AC_DIVERT_PUSH/AC_DIVERT_POP these variable definitions so they
|
||||
dnl are available for $ac_help expansion (don't we all *love* autoconf?)
|
||||
-AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
|
||||
+#AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)
|
||||
+#dnl
|
||||
#
|
||||
# The following version number definitions apply to GLib, GModule and GThread
|
||||
# as a whole, so if changes occoured in any of them, they are all
|
||||
@@ -38,7 +76,7 @@
|
||||
GLIB_BINARY_AGE=8
|
||||
GLIB_VERSION=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION.$GLIB_MICRO_VERSION
|
||||
dnl
|
||||
-AC_DIVERT_POP()dnl
|
||||
+#AC_DIVERT_POP()dnl
|
||||
|
||||
AC_SUBST(GLIB_MAJOR_VERSION)
|
||||
AC_SUBST(GLIB_MINOR_VERSION)
|
||||
@@ -77,17 +115,15 @@
|
||||
dnl Initialize maintainer mode
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
-AC_CANONICAL_HOST
|
||||
-
|
||||
dnl figure debugging default, prior to $ac_help setup
|
||||
dnl
|
||||
-AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
|
||||
+#AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
|
||||
if test `expr $GLIB_MINOR_VERSION \% 2` = 1 ; then
|
||||
debug_default=yes
|
||||
else
|
||||
debug_default=minimum
|
||||
fi
|
||||
-AC_DIVERT_POP()dnl
|
||||
+#AC_DIVERT_POP()dnl
|
||||
|
||||
dnl declare --enable-* args and collect ac_help strings
|
||||
AC_ARG_ENABLE(debug, [ --enable-debug=[no/minimum/yes] turn on debugging [default=$debug_default]],,enable_debug=$debug_default)
|
||||
@@ -173,7 +209,9 @@
|
||||
CFLAGS=$glib_save_CFLAGS
|
||||
AC_MSG_WARN(
|
||||
[No ANSI prototypes found in library. (-std1 didn't work.)])
|
||||
+ , AC_MSG_WARN([Skipping test due to crosscompilation])
|
||||
)
|
||||
+ , AC_MSG_WARN([Skipping test due to crosscompilation])
|
||||
)
|
||||
LIBS=$glib_save_LIBS
|
||||
|
||||
@@ -384,11 +422,13 @@
|
||||
return realloc (0, sizeof (int)) == 0;
|
||||
}],
|
||||
glib_cv_sane_realloc=yes
|
||||
- AC_DEFINE(REALLOC_0_WORKS)
|
||||
,
|
||||
glib_cv_sane_realloc=no
|
||||
,)
|
||||
])
|
||||
+if test "x$glib_cv_sane_realloc" = "xyes"; then
|
||||
+ AC_DEFINE(REALLOC_0_WORKS)
|
||||
+fi
|
||||
AC_MSG_RESULT($glib_cv_sane_realloc)
|
||||
|
||||
|
||||
@@ -464,7 +504,8 @@
|
||||
])
|
||||
if test "x$glib_cv_va_copy" = "xyes"; then
|
||||
AC_DEFINE(G_VA_COPY, va_copy)
|
||||
-else if test "x$glib_cv___va_copy" = "xyes"; then
|
||||
+else
|
||||
+if test "x$glib_cv___va_copy" = "xyes"; then
|
||||
AC_DEFINE(G_VA_COPY, __va_copy)
|
||||
fi
|
||||
fi
|
||||
@@ -473,6 +514,7 @@
|
||||
fi
|
||||
AC_MSG_RESULT($glib_cv_va_val_copy)
|
||||
|
||||
+AC_MSG_WARN([hi mom])
|
||||
|
||||
dnl ***********************
|
||||
dnl *** g_module checks ***
|
||||
@@ -483,21 +525,27 @@
|
||||
G_MODULE_NEED_USCORE=0
|
||||
G_MODULE_HAVE_DLERROR=0
|
||||
dnl *** dlopen() and dlsym() in system libraries
|
||||
+AC_CHECK_FUNC(dlopen,[
|
||||
+ AC_CHECK_FUNC(dlsym,[
|
||||
+ G_MODULE_IMPL=G_MODULE_IMPL_DL
|
||||
+ ],
|
||||
+ )],
|
||||
+)
|
||||
if test -z "$G_MODULE_IMPL"; then
|
||||
- AC_CHECK_FUNC(dlopen,
|
||||
- AC_CHECK_FUNC(dlsym,
|
||||
+ AC_CHECK_FUNC(dlopen,[
|
||||
+ AC_CHECK_FUNC(dlsym,[
|
||||
G_MODULE_IMPL=G_MODULE_IMPL_DL
|
||||
- ,)
|
||||
- ,)
|
||||
+ ])],
|
||||
+ )
|
||||
fi
|
||||
dnl *** dlopen() and dlsym() in libdl
|
||||
if test -z "$G_MODULE_IMPL"; then
|
||||
- AC_CHECK_LIB(dl, dlopen,
|
||||
- AC_CHECK_LIB(dl, dlsym,
|
||||
+ AC_CHECK_LIB(dl, dlopen,[
|
||||
+ AC_CHECK_LIB(dl, dlsym,[
|
||||
G_MODULE_LIBS=-ldl
|
||||
G_MODULE_IMPL=G_MODULE_IMPL_DL
|
||||
- ,)
|
||||
- ,)
|
||||
+ ])]
|
||||
+ )
|
||||
fi
|
||||
dnl *** shl_load() in libdld (HP-UX)
|
||||
if test -z "$G_MODULE_IMPL"; then
|
||||
@@ -576,6 +624,7 @@
|
||||
AC_SUBST(G_MODULE_HAVE_DLERROR)
|
||||
AC_SUBST(G_MODULE_NEED_USCORE)
|
||||
AC_SUBST(GLIB_DEBUG_FLAGS)
|
||||
+AC_MSG_WARN([hi mom])
|
||||
|
||||
|
||||
dnl ***********************
|
||||
@@ -812,38 +861,50 @@
|
||||
fi
|
||||
if test x"$have_threads" = xposix; then
|
||||
LIBS="$LIBS $G_THREAD_LIBS"
|
||||
- AC_MSG_CHECKING(whether pthread_getspecific is posix like)
|
||||
# PCThreads has pthread_getspecific(pthread_key_t, void **);
|
||||
- AC_TRY_COMPILE([#include <pthread.h>],
|
||||
- [pthread_getspecific(0,NULL);],
|
||||
- [AC_MSG_RESULT(no)],
|
||||
- [AC_MSG_RESULT(yes)
|
||||
- AC_DEFINE(HAVE_PTHREAD_GETSPECIFIC_POSIX)])
|
||||
- AC_MSG_CHECKING(whether pthread_mutex_trylock is posix like)
|
||||
+ AC_CACHE_CHECK([whether pthread_getspecific is posix like],
|
||||
+ [glib_cv_sys_pthread_getspecific_posix],
|
||||
+ AC_TRY_COMPILE([#include <pthread.h>],
|
||||
+ [pthread_getspecific(0,NULL);],
|
||||
+ [glib_cv_sys_pthread_getspecific_posix=no],
|
||||
+ [glib_cv_sys_pthread_getspecific_posix=yes])
|
||||
+ )
|
||||
+ if test x"$glib_cv_sys_pthread_getspecific_posix" = xyes; then
|
||||
+ AC_DEFINE(HAVE_PTHREAD_GETSPECIFIC_POSIX)
|
||||
+ fi
|
||||
# DCE Threads return 1 as success, posix 0. what a mess.
|
||||
- AC_TRY_RUN([#include <pthread.h>
|
||||
- pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
|
||||
- int main () {
|
||||
- return !pthread_mutex_trylock (&mutex); }],
|
||||
- [AC_MSG_RESULT(no)],
|
||||
- [AC_MSG_RESULT(yes)
|
||||
- AC_DEFINE(HAVE_PTHREAD_MUTEX_TRYLOCK_POSIX)])
|
||||
- AC_MSG_CHECKING(whether pthread_cond_timedwait is posix like)
|
||||
+ AC_CACHE_CHECK([whether pthread_mutex_trylock is posix like],
|
||||
+ [glib_cv_sys_pthread_mutex_trylock_posix],
|
||||
+ AC_TRY_RUN([#include <pthread.h>
|
||||
+ pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
|
||||
+ int main () {
|
||||
+ return !pthread_mutex_trylock (&mutex); }],
|
||||
+ [glib_cv_sys_pthread_mutex_trylock_posix=no],
|
||||
+ [glib_cv_sys_pthread_mutex_trylock_posix=yes])
|
||||
+ )
|
||||
+ if test x"$glib_cv_sys_pthread_mutex_trylock_posix" = xyes; then
|
||||
+ AC_DEFINE(HAVE_PTHREAD_MUTEX_TRYLOCK_POSIX)
|
||||
+ fi
|
||||
# DCE Threads return -1 as failure, posix ETIMEDOUT.
|
||||
- AC_TRY_RUN([#include <pthread.h>
|
||||
- int main () {
|
||||
- pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
|
||||
- pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
|
||||
- struct timeval tval;
|
||||
- struct timespec tspec;
|
||||
- gettimeofday (&tval, NULL);
|
||||
- tspec.tv_sec = tval.tv_sec;
|
||||
- tspec.tv_nsec = 0;
|
||||
- return pthread_cond_timedwait (&cond,&mutex,&tspec)
|
||||
- != -1;}],
|
||||
- [AC_MSG_RESULT(no)],
|
||||
- [AC_MSG_RESULT(yes)
|
||||
- AC_DEFINE(HAVE_PTHREAD_COND_TIMEDWAIT_POSIX)])
|
||||
+ AC_CACHE_CHECK([whether pthread_cond_timedwait is posix like],
|
||||
+ [glib_cv_sys_pthread_cond_timedwait_posix],
|
||||
+ AC_TRY_RUN([#include <pthread.h>
|
||||
+ int main () {
|
||||
+ pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
|
||||
+ pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
|
||||
+ struct timeval tval;
|
||||
+ struct timespec tspec;
|
||||
+ gettimeofday (&tval, NULL);
|
||||
+ tspec.tv_sec = tval.tv_sec;
|
||||
+ tspec.tv_nsec = 0;
|
||||
+ return pthread_cond_timedwait (&cond,&mutex,&tspec)
|
||||
+ != -1;}],
|
||||
+ [glib_cv_sys_pthread_cond_timedwait_posix=no],
|
||||
+ [glib_cv_sys_pthread_cond_timedwait_posix=yes])
|
||||
+ )
|
||||
+ if test x"$glib_cv_sys_pthread_cond_timedwait_posix" = xyes; then
|
||||
+ AC_DEFINE(HAVE_PTHREAD_COND_TIMEDWAIT_POSIX)
|
||||
+ fi
|
||||
fi
|
||||
LIBS="$glib_save_LIBS"
|
||||
CFLAGS="$glib_save_CFLAGS"
|
||||
@@ -887,13 +948,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 *** output the whole stuff ***
|
||||
@@ -950,7 +1012,7 @@
|
||||
echo '#define GLIB_HAVE_SYS_POLL_H' >> $outfile
|
||||
fi
|
||||
|
||||
- cat >> $outfile <<_______EOF
|
||||
+ cat >> $outfile <<EOF
|
||||
|
||||
#define G_MINFLOAT $glib_mf
|
||||
#define G_MAXFLOAT $glib_Mf
|
||||
@@ -963,60 +1025,60 @@
|
||||
#define G_MINLONG $glib_ml
|
||||
#define G_MAXLONG $glib_Ml
|
||||
|
||||
-_______EOF
|
||||
+EOF
|
||||
|
||||
|
||||
### this should always be true in a modern C/C++ compiler
|
||||
- cat >>$outfile <<_______EOF
|
||||
+ cat >>$outfile <<EOF
|
||||
typedef signed char gint8;
|
||||
typedef unsigned char guint8;
|
||||
-_______EOF
|
||||
+EOF
|
||||
|
||||
|
||||
if test -n "$gint16"; then
|
||||
- cat >>$outfile <<_______EOF
|
||||
+ cat >>$outfile <<EOF
|
||||
typedef signed $gint16 gint16;
|
||||
typedef unsigned $gint16 guint16;
|
||||
-_______EOF
|
||||
+EOF
|
||||
fi
|
||||
|
||||
|
||||
if test -n "$gint32"; then
|
||||
- cat >>$outfile <<_______EOF
|
||||
+ cat >>$outfile <<EOF
|
||||
typedef signed $gint32 gint32;
|
||||
typedef unsigned $gint32 guint32;
|
||||
-_______EOF
|
||||
+EOF
|
||||
fi
|
||||
|
||||
|
||||
if test -n "$gint64"; then
|
||||
- cat >>$outfile <<_______EOF
|
||||
+ cat >>$outfile <<EOF
|
||||
${glib_warning_guard}#define G_HAVE_GINT64 1
|
||||
|
||||
${glib_extension}typedef signed $gint64 gint64;
|
||||
${glib_extension}typedef unsigned $gint64 guint64;
|
||||
|
||||
#define G_GINT64_CONSTANT(val) $gint64_constant
|
||||
-_______EOF
|
||||
+EOF
|
||||
fi
|
||||
|
||||
|
||||
if test -z "$glib_unknown_void_p"; then
|
||||
- cat >>$outfile <<_______EOF
|
||||
+ cat >>$outfile <<EOF
|
||||
|
||||
#define GPOINTER_TO_INT(p) ((gint) ${glib_gpi_cast} (p))
|
||||
#define GPOINTER_TO_UINT(p) ((guint) ${glib_gpui_cast} (p))
|
||||
|
||||
#define GINT_TO_POINTER(i) ((gpointer) ${glib_gpi_cast} (i))
|
||||
#define GUINT_TO_POINTER(u) ((gpointer) ${glib_gpui_cast} (u))
|
||||
-_______EOF
|
||||
+EOF
|
||||
else
|
||||
echo '#error SIZEOF_VOID_P unknown - This should never happen' >>$outfile
|
||||
fi
|
||||
|
||||
|
||||
|
||||
- cat >>$outfile <<_______EOF
|
||||
+ cat >>$outfile <<EOF
|
||||
$glib_atexit
|
||||
$glib_memmove
|
||||
$glib_defines
|
||||
@@ -1028,11 +1090,11 @@
|
||||
#else /* !__cplusplus */
|
||||
$glib_inline
|
||||
#endif /* !__cplusplus */
|
||||
-_______EOF
|
||||
+EOF
|
||||
|
||||
echo >>$outfile
|
||||
if test x$g_mutex_has_default = xyes; then
|
||||
- cat >>$outfile <<_______EOF
|
||||
+ cat >>$outfile <<EOF
|
||||
$g_enable_threads_def G_THREADS_ENABLED
|
||||
#define G_THREADS_IMPL_$g_threads_impl_def
|
||||
typedef struct _GStaticMutex GStaticMutex;
|
||||
@@ -1050,15 +1112,15 @@
|
||||
#define g_static_mutex_get_mutex(mutex) \
|
||||
(g_thread_use_default_impl ? ((GMutex*) &((mutex)->aligned_pad_u)) : \
|
||||
g_static_mutex_get_mutex_impl (&((mutex)->runtime_mutex)))
|
||||
-_______EOF
|
||||
+EOF
|
||||
else
|
||||
- cat >>$outfile <<_______EOF
|
||||
+ cat >>$outfile <<EOF
|
||||
$g_enable_threads_def G_THREADS_ENABLED
|
||||
#define G_THREADS_IMPL_$g_threads_impl_def
|
||||
typedef struct _GMutex* GStaticMutex;
|
||||
#define G_STATIC_MUTEX_INIT NULL
|
||||
#define g_static_mutex_get_mutex(mutex) (g_static_mutex_get_mutex_impl (mutex))
|
||||
-_______EOF
|
||||
+EOF
|
||||
fi
|
||||
|
||||
echo >>$outfile
|
||||
@@ -1067,15 +1129,15 @@
|
||||
g_bit_sizes="$g_bit_sizes 64"
|
||||
fi
|
||||
for bits in $g_bit_sizes; do
|
||||
- cat >>$outfile <<_______EOF
|
||||
+ cat >>$outfile <<EOF
|
||||
#define GINT${bits}_TO_${g_bs_native}(val) ((gint${bits}) (val))
|
||||
#define GUINT${bits}_TO_${g_bs_native}(val) ((guint${bits}) (val))
|
||||
#define GINT${bits}_TO_${g_bs_alien}(val) ((gint${bits}) GUINT${bits}_SWAP_LE_BE (val))
|
||||
#define GUINT${bits}_TO_${g_bs_alien}(val) (GUINT${bits}_SWAP_LE_BE (val))
|
||||
-_______EOF
|
||||
+EOF
|
||||
done
|
||||
|
||||
- cat >>$outfile <<_______EOF
|
||||
+ cat >>$outfile <<EOF
|
||||
#define GLONG_TO_LE(val) ((glong) GINT${glongbits}_TO_LE (val))
|
||||
#define GULONG_TO_LE(val) ((gulong) GUINT${glongbits}_TO_LE (val))
|
||||
#define GLONG_TO_BE(val) ((glong) GINT${glongbits}_TO_BE (val))
|
||||
@@ -1086,14 +1148,14 @@
|
||||
#define GUINT_TO_BE(val) ((guint) GUINT${gintbits}_TO_BE (val))
|
||||
#define G_BYTE_ORDER $g_byte_order
|
||||
|
||||
-_______EOF
|
||||
+EOF
|
||||
|
||||
if test -r glibconfig-sysdefs.h; then
|
||||
cat glibconfig-sysdefs.h >>$outfile
|
||||
fi
|
||||
|
||||
|
||||
- cat >>$outfile <<_______EOF
|
||||
+ cat >>$outfile <<EOF
|
||||
|
||||
$glib_wc
|
||||
|
||||
@@ -1103,7 +1165,7 @@
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#endif /* GLIBCONFIG_H */
|
||||
-_______EOF
|
||||
+EOF
|
||||
|
||||
|
||||
if cmp -s $outfile glibconfig.h; then
|
||||
--- pkgconfig-0.15.0/glib-1.2.8/gmodule/Makefile.am~configure.patch
|
||||
+++ pkgconfig-0.15.0/glib-1.2.8/gmodule/Makefile.am
|
||||
@@ -41,7 +41,7 @@
|
||||
libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
|
||||
|
||||
noinst_PROGRAMS = testgmodule
|
||||
-testgmodule_LDFLAGS += @G_MODULE_LDFLAGS@
|
||||
+testgmodule_LDFLAGS = @G_MODULE_LDFLAGS@
|
||||
testgmodule_LDADD = libgmodule.la $(libglib) @G_MODULE_LIBS@
|
||||
|
||||
.PHONY: files release
|
||||
--- pkgconfig-0.15.0/pkg.m4~configure.patch
|
||||
+++ pkgconfig-0.15.0/pkg.m4
|
||||
@@ -2,7 +2,7 @@
|
||||
dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
|
||||
dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
|
||||
dnl also defines GSTUFF_PKG_ERRORS on error
|
||||
-AC_DEFUN(PKG_CHECK_MODULES, [
|
||||
+AC_DEFUN([PKG_CHECK_MODULES], [
|
||||
succeeded=no
|
||||
|
||||
if test -z "$PKG_CONFIG"; then
|
||||
--- pkgconfig-0.15.0/configure.in~configure.patch
|
||||
+++ pkgconfig-0.15.0/configure.in
|
||||
@@ -1,6 +1,7 @@
|
||||
|
||||
AC_INIT(pkg-config.1)
|
||||
|
||||
+AC_CONFIG_AUX_DIR(.)
|
||||
AM_INIT_AUTOMAKE(pkgconfig, 0.15.0)
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
@@ -37,8 +38,6 @@
|
||||
|
||||
AC_SUBST(GLIB_LIBS)
|
||||
AC_SUBST(GLIB_CFLAGS)
|
||||
-
|
||||
- AC_CONFIG_AUX_DIR(.)
|
||||
else
|
||||
AC_CONFIG_SUBDIRS(glib-1.2.8)
|
||||
fi # !native_win32
|
||||
@@ -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
|
||||
156
meta/packages/pkgconfig/pkgconfig-0.15.0/pkg.m4
vendored
156
meta/packages/pkgconfig/pkgconfig-0.15.0/pkg.m4
vendored
@@ -1,156 +0,0 @@
|
||||
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
|
||||
#
|
||||
# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful, but
|
||||
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
# General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
#
|
||||
# As a special exception to the GNU General Public License, if you
|
||||
# distribute this file as part of a program that contains a
|
||||
# configuration script generated by Autoconf, you may include it under
|
||||
# the same distribution terms that you use for the rest of that program.
|
||||
|
||||
# PKG_PROG_PKG_CONFIG([MIN-VERSION])
|
||||
# ----------------------------------
|
||||
AC_DEFUN([PKG_PROG_PKG_CONFIG],
|
||||
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
|
||||
m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
|
||||
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
|
||||
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
|
||||
AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
|
||||
fi
|
||||
if test -n "$PKG_CONFIG"; then
|
||||
_pkg_min_version=m4_default([$1], [0.9.0])
|
||||
AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
|
||||
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
|
||||
AC_MSG_RESULT([yes])
|
||||
else
|
||||
AC_MSG_RESULT([no])
|
||||
PKG_CONFIG=""
|
||||
fi
|
||||
|
||||
fi[]dnl
|
||||
])# PKG_PROG_PKG_CONFIG
|
||||
|
||||
# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
|
||||
#
|
||||
# Check to see whether a particular set of modules exists. Similar
|
||||
# to PKG_CHECK_MODULES(), but does not set variables or print errors.
|
||||
#
|
||||
#
|
||||
# Similar to PKG_CHECK_MODULES, make sure that the first instance of
|
||||
# this or PKG_CHECK_MODULES is called, or make sure to call
|
||||
# PKG_CHECK_EXISTS manually
|
||||
# --------------------------------------------------------------
|
||||
AC_DEFUN([PKG_CHECK_EXISTS],
|
||||
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
|
||||
m4_ifval([$2], [$2], [:])
|
||||
m4_ifvaln([$3], [else
|
||||
$3])dnl
|
||||
fi])
|
||||
|
||||
|
||||
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
|
||||
# ---------------------------------------------
|
||||
m4_define([_PKG_CONFIG],
|
||||
[if test -n "$PKG_CONFIG"; then
|
||||
if test -n "$$1"; then
|
||||
pkg_cv_[]$1="$$1"
|
||||
else
|
||||
PKG_CHECK_EXISTS([$3],
|
||||
[pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
|
||||
[pkg_failed=yes])
|
||||
fi
|
||||
else
|
||||
pkg_failed=untried
|
||||
fi[]dnl
|
||||
])# _PKG_CONFIG
|
||||
|
||||
# _PKG_SHORT_ERRORS_SUPPORTED
|
||||
# -----------------------------
|
||||
AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
|
||||
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
|
||||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
||||
_pkg_short_errors_supported=yes
|
||||
else
|
||||
_pkg_short_errors_supported=no
|
||||
fi[]dnl
|
||||
])# _PKG_SHORT_ERRORS_SUPPORTED
|
||||
|
||||
|
||||
# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
|
||||
# [ACTION-IF-NOT-FOUND])
|
||||
#
|
||||
#
|
||||
# Note that if there is a possibility the first call to
|
||||
# PKG_CHECK_MODULES might not happen, you should be sure to include an
|
||||
# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
|
||||
#
|
||||
#
|
||||
# --------------------------------------------------------------
|
||||
AC_DEFUN([PKG_CHECK_MODULES],
|
||||
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
|
||||
AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
|
||||
AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
|
||||
|
||||
pkg_failed=no
|
||||
AC_MSG_CHECKING([for $1])
|
||||
|
||||
_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
|
||||
_PKG_CONFIG([$1][_LIBS], [libs], [$2])
|
||||
|
||||
m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
|
||||
and $1[]_LIBS to avoid the need to call pkg-config.
|
||||
See the pkg-config man page for more details.])
|
||||
|
||||
if test $pkg_failed = yes; then
|
||||
_PKG_SHORT_ERRORS_SUPPORTED
|
||||
if test $_pkg_short_errors_supported = yes; then
|
||||
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
|
||||
else
|
||||
$1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
|
||||
fi
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
|
||||
|
||||
ifelse([$4], , [AC_MSG_ERROR(dnl
|
||||
[Package requirements ($2) were not met:
|
||||
|
||||
$$1_PKG_ERRORS
|
||||
|
||||
Consider adjusting the PKG_CONFIG_PATH environment variable if you
|
||||
installed software in a non-standard prefix.
|
||||
|
||||
_PKG_TEXT
|
||||
])],
|
||||
[$4])
|
||||
elif test $pkg_failed = untried; then
|
||||
ifelse([$4], , [AC_MSG_FAILURE(dnl
|
||||
[The pkg-config script could not be found or is too old. Make sure it
|
||||
is in your PATH or set the PKG_CONFIG environment variable to the full
|
||||
path to pkg-config.
|
||||
|
||||
_PKG_TEXT
|
||||
|
||||
To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
|
||||
[$4])
|
||||
else
|
||||
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
|
||||
$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
|
||||
AC_MSG_RESULT([yes])
|
||||
ifelse([$3], , :, [$3])
|
||||
fi[]dnl
|
||||
])# PKG_CHECK_MODULES
|
||||
@@ -1,7 +0,0 @@
|
||||
SECTION = "console/utils"
|
||||
require pkgconfig_${PV}.bb
|
||||
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/pkgconfig-${PV}"
|
||||
|
||||
S = "${WORKDIR}/pkgconfig-${PV}"
|
||||
inherit native
|
||||
DEPENDS = ""
|
||||
@@ -1,26 +0,0 @@
|
||||
SECTION = "console/utils"
|
||||
DESCRIPTION = "pkg-config is a system for managing library \
|
||||
compile/link flags that works with automake and autoconf. \
|
||||
It replaces the ubiquitous *-config scripts you may have \
|
||||
seen with a single tool."
|
||||
HOMEPAGE = "http://www.freedesktop.org/software/pkgconfig/"
|
||||
LICENSE = "GPL"
|
||||
PR = "r2"
|
||||
|
||||
SRC_URI = "http://www.freedesktop.org/software/pkgconfig/releases/pkgconfig-${PV}.tar.gz \
|
||||
file://configure.patch;patch=1 \
|
||||
file://pkg.m4 \
|
||||
file://glibconfig-sysdefs.h"
|
||||
|
||||
inherit autotools
|
||||
|
||||
acpaths = "-I ."
|
||||
do_configure_prepend () {
|
||||
install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h glib-1.2.8/
|
||||
install -m 0644 ${WORKDIR}/pkg.m4 ${S}/
|
||||
}
|
||||
|
||||
do_stage_append() {
|
||||
install -d -m 0755 ${STAGING_DATADIR}/pkgconfig
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user