From 709c4d66e0b107ca606941b988bad717c0b45d9b Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Tue, 17 Mar 2009 14:32:59 -0400 Subject: rename packages/ to recipes/ per earlier agreement See links below for more details: http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326 http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816 Signed-off-by: Denys Dmytriyenko Acked-by: Mike Westerhof Acked-by: Philip Balister Acked-by: Khem Raj Acked-by: Marcin Juszkiewicz Acked-by: Koen Kooi Acked-by: Frans Meulenbroeks --- .../proxy-libintl-20080418/stub-only.patch | 72 ---------------------- packages/proxy-libintl/proxy-libintl_20080418.bb | 46 -------------- 2 files changed, 118 deletions(-) delete mode 100644 packages/proxy-libintl/proxy-libintl-20080418/stub-only.patch delete mode 100644 packages/proxy-libintl/proxy-libintl_20080418.bb (limited to 'packages/proxy-libintl') diff --git a/packages/proxy-libintl/proxy-libintl-20080418/stub-only.patch b/packages/proxy-libintl/proxy-libintl-20080418/stub-only.patch deleted file mode 100644 index 7186b13c06..0000000000 --- a/packages/proxy-libintl/proxy-libintl-20080418/stub-only.patch +++ /dev/null @@ -1,72 +0,0 @@ -Index: proxy-libintl/src/proxy-libintl/libintl.c -=================================================================== ---- proxy-libintl.orig/src/proxy-libintl/libintl.c -+++ proxy-libintl/src/proxy-libintl/libintl.c -@@ -18,9 +18,12 @@ - */ - - #ifdef _WIN32 --#include -+# include - #else --#include -+# include -+# if !STUB_ONLY -+# include -+# endif - typedef void* HMODULE; - #endif - -@@ -65,11 +68,13 @@ static char * (*p_bind_textdomain_codese - static int - use_intl_dll (HMODULE dll) - { --#ifdef _WIN32 --#define LOOKUP(fn) p_##fn = (void *) GetProcAddress (dll, #fn); if (p_##fn == NULL) return 0 --#else --#define LOOKUP(fn) p_##fn = (void *) dlsym (dll, #fn); if (p_##fn == NULL) return 0 --#endif -+#if !STUB_ONLY -+# ifdef _WIN32 -+# define LOOKUP(fn) p_##fn = (void *) GetProcAddress (dll, #fn); if (p_##fn == NULL) return 0 -+# else -+# define LOOKUP(fn) p_##fn = (void *) dlsym (dll, #fn); if (p_##fn == NULL) return 0 -+# endif /* _WIN32 */ -+ - - LOOKUP (gettext); - LOOKUP (dgettext); -@@ -82,7 +87,7 @@ use_intl_dll (HMODULE dll) - LOOKUP (bind_textdomain_codeset); - - #undef LOOKUP -- -+#endif /* !STUB_ONLY */ - return 1; - } - -@@ -171,13 +176,17 @@ setup (void) - - if (!beenhere) - { --#ifdef _WIN32 -- HMODULE intl_dll = LoadLibrary ("intl.dll"); --#elif defined(__APPLE__) && defined(__MACH__) -- HMODULE intl_dll = dlopen ("libintl.dylib", RTLD_LAZY); --#else -- HMODULE intl_dll = dlopen ("libintl.so", RTLD_LAZY); --#endif -+#if !STUB_ONLY -+# ifdef _WIN32 -+ HMODULE intl_dll = LoadLibrary ("intl.dll"); -+# elif defined(__APPLE__) && defined(__MACH__) -+ HMODULE intl_dll = dlopen ("libintl.dylib", RTLD_LAZY); -+# else -+ HMODULE intl_dll = dlopen ("libintl.so", RTLD_LAZY); -+# endif -+#else /* !STUB_ONLY */ -+ HMODULE intl_dll = NULL; -+#endif /* STUB_ONLY */ - - if (intl_dll != NULL && - use_intl_dll (intl_dll)) diff --git a/packages/proxy-libintl/proxy-libintl_20080418.bb b/packages/proxy-libintl/proxy-libintl_20080418.bb deleted file mode 100644 index dbe7b92c7e..0000000000 --- a/packages/proxy-libintl/proxy-libintl_20080418.bb +++ /dev/null @@ -1,46 +0,0 @@ -DESCRIPTION = "Proxy libintl" -HOMEPAGE = "http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/" -SECTION = "libs" -LICENSE = "LGPL" - -PR = "r1" -PROVIDES = "virtual/libintl" - - -SRC_URI = " \ - http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/${PN}-${PV}.zip \ - file://stub-only.patch;patch=1 \ -" - - -S = "${WORKDIR}" -FILES_${PN}-dev = "${includedir} ${libdir}" - - -CFLAGS_append = " -Wall -I ../../include ${@['-DSTUB_ONLY', ''][bb.data.getVar('USE_NLS', d, 1) != 'no']}" - -do_compile() { - cd ${WORKDIR}/src/proxy-libintl - oe_runmake -} - - - - -do_install() { - install -d ${D}/usr/include - install -d ${D}/usr/lib - - install -m 0644 ${WORKDIR}/include/libintl.h ${D}/${includedir} - install -m 0644 ${WORKDIR}/lib/libintl.a ${D}/${libdir} -} - - - -do_stage() { - install -m 0644 ${WORKDIR}/include/libintl.h ${STAGING_INCDIR}/ - oe_libinstall -a -C lib libintl ${STAGING_LIBDIR}/ -} - - - -- cgit v1.2.3