[oe-commits] org.oe.dev proxy-libintl: From #4370, dummy replacement for gettext.

[geoffrey.wossum commit]

proxy-libintl: From #4370, dummy replacement for gettext.

Author: geoffrey.wossum
Branch: org.openembedded.dev
Revision: 91c63769306aea5155ca204befd94599cfe34880
ViewMTN: http://monotone.openembedded.org/revision/info/91c63769306aea5155ca204befd94599cfe34880
Files:
1
packages/proxy-libintl
packages/proxy-libintl/proxy-libintl-20080418
packages/proxy-libintl/proxy-libintl-20080418/stub-only.patch
packages/proxy-libintl/proxy-libintl_20080418.bb
Diffs:

#
# mt diff -ra17b5ac6bf09c1cfe29c784e2b1497684e1832ca -r91c63769306aea5155ca204befd94599cfe34880
#
#
#
# add_dir "packages/proxy-libintl"
# 
# add_dir "packages/proxy-libintl/proxy-libintl-20080418"
# 
# add_file "packages/proxy-libintl/proxy-libintl-20080418/stub-only.patch"
#  content [cd5a6eadb3df3174fd8fb17a1a794e0f11573a03]
# 
# add_file "packages/proxy-libintl/proxy-libintl_20080418.bb"
#  content [5f098356ea6c56a4a64655b7ed87cc62a7afed12]
#
============================================================
--- packages/proxy-libintl/proxy-libintl-20080418/stub-only.patch	cd5a6eadb3df3174fd8fb17a1a794e0f11573a03
+++ packages/proxy-libintl/proxy-libintl-20080418/stub-only.patch	cd5a6eadb3df3174fd8fb17a1a794e0f11573a03
@@ -0,0 +1,72 @@
+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 <windows.h>
++#  include <windows.h>
+ #else
+-#include <dlfcn.h>
++#  include <stddef.h>
++#  if !STUB_ONLY
++#    include <dlfcn.h>
++#  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))
============================================================
--- packages/proxy-libintl/proxy-libintl_20080418.bb	5f098356ea6c56a4a64655b7ed87cc62a7afed12
+++ packages/proxy-libintl/proxy-libintl_20080418.bb	5f098356ea6c56a4a64655b7ed87cc62a7afed12
@@ -0,0 +1,46 @@
+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}/
+}
+
+
+