From 41bb218dae87217c0107537cd4ef4bd17ccbc36d Mon Sep 17 00:00:00 2001 From: Doug Goldstein Date: Thu, 2 Feb 2017 09:47:37 -0600 Subject: removed ustr package as it is unused Signed-off-by: Doug Goldstein Signed-off-by: Joe MacDonald --- recipes-extended/ustr/ustr/ustr-c99-inline.patch | 30 - .../ustr/ustr/ustr-fix__va_copy-not-defined.patch | 26 - recipes-extended/ustr/ustr/ustr-gnu-inline.diff | 871 --------------------- recipes-extended/ustr/ustr/ustr-makefile-fix.patch | 215 ----- recipes-extended/ustr/ustr_1.0.4.bb | 55 -- 5 files changed, 1197 deletions(-) delete mode 100644 recipes-extended/ustr/ustr/ustr-c99-inline.patch delete mode 100644 recipes-extended/ustr/ustr/ustr-fix__va_copy-not-defined.patch delete mode 100644 recipes-extended/ustr/ustr/ustr-gnu-inline.diff delete mode 100644 recipes-extended/ustr/ustr/ustr-makefile-fix.patch delete mode 100644 recipes-extended/ustr/ustr_1.0.4.bb diff --git a/recipes-extended/ustr/ustr/ustr-c99-inline.patch b/recipes-extended/ustr/ustr/ustr-c99-inline.patch deleted file mode 100644 index dfa021f..0000000 --- a/recipes-extended/ustr/ustr/ustr-c99-inline.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -rup ustr-1.0.4-orig/ustr-compiler.h ustr-1.0.4/ustr-compiler.h ---- ustr-1.0.4-orig/ustr-compiler.h 2008-02-15 15:12:28.000000000 -0500 -+++ ustr-1.0.4/ustr-compiler.h 2008-06-13 15:25:18.000000000 -0400 -@@ -113,17 +113,23 @@ - #endif - - #ifndef USTR_CONF_EI_PROTO /* external inline */ --# if USTR_CONF_INCLUDE_CODEONLY_HEADERS -+# if USTR_CONF_INCLUDE_CODEONLY_HEADERS || ! defined(__GNUC__) || \ -+ ! USTR_CONF_COMPILE_USE_INLINE - # define USTR_CONF_EI_PROTO static USTR__INLINE - # else - # define USTR_CONF_EI_PROTO extern - # endif - #endif - #ifndef USTR_CONF_II_PROTO /* implementation of inline */ --# if USTR_CONF_INCLUDE_CODEONLY_HEADERS -+# if USTR_CONF_INCLUDE_CODEONLY_HEADERS || ! defined(__GNUC__) || \ -+ ! USTR_CONF_COMPILE_USE_INLINE - # define USTR_CONF_II_PROTO static USTR__INLINE - # else --# define USTR_CONF_II_PROTO extern inline -+# if defined(__GNUC_STDC_INLINE__) || defined(__GNUC_GNU_INLINE__) -+# define USTR_CONF_II_PROTO extern inline __attribute__ ((__gnu_inline__)) -+# else -+# define USTR_CONF_II_PROTO extern inline -+# endif - # endif - #endif - diff --git a/recipes-extended/ustr/ustr/ustr-fix__va_copy-not-defined.patch b/recipes-extended/ustr/ustr/ustr-fix__va_copy-not-defined.patch deleted file mode 100644 index cd5ef87..0000000 --- a/recipes-extended/ustr/ustr/ustr-fix__va_copy-not-defined.patch +++ /dev/null @@ -1,26 +0,0 @@ -From c35a8949e305666ffe7fdc89f7cf506c6e6821d0 Mon Sep 17 00:00:00 2001 -From: Xin Ouyang -Date: Fri, 3 Feb 2012 11:28:21 +0800 -Subject: [PATCH] Fix "__va_copy" not defined warning. - -ustr-compiler.h:19:16: warning: "__va_copy" is not defined [-Wundef] ---- - ustr-compiler.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/ustr-compiler.h b/ustr-compiler.h -index 9e71276..642e6e8 100644 ---- a/ustr-compiler.h -+++ b/ustr-compiler.h -@@ -16,7 +16,7 @@ - #ifdef va_copy - # define USTR_CONF_HAVE_VA_COPY 1 - # define USTR__VA_COPY(x, y) va_copy(x, y) --#elif __va_copy -+#elif defined(__va_copy) - # define USTR_CONF_HAVE_VA_COPY 1 - # define USTR__VA_COPY(x, y) __va_copy(x, y) - #else --- -1.7.5.4 - diff --git a/recipes-extended/ustr/ustr/ustr-gnu-inline.diff b/recipes-extended/ustr/ustr/ustr-gnu-inline.diff deleted file mode 100644 index 7ea0454..0000000 --- a/recipes-extended/ustr/ustr/ustr-gnu-inline.diff +++ /dev/null @@ -1,871 +0,0 @@ -From: Václav Ovsík -Subject: [PATCH] fixes/gnu-inline - -This patch adds `__attribute__ ((gnu_inline))' into prototype macros -before `inline' to force GNU89 behaviour of inline functions -in C99 mode. -See http://www.gnu.org/software/gcc/gcc-5/porting_to.html - -Signed-off-by: Václav Ovsík - -Update it to fix the conflicts with ustr-c99-inline.patch. - -Upstream-Status: Backport [debian] - -Signed-off-by: Robert Yang - ---- - ustr-b-dbg-code.c | 8 ++++---- - ustr-b-opt-code.c | 8 ++++---- - ustr-cmp-dbg-code.c | 8 ++++---- - ustr-cmp-opt-code.c | 8 ++++---- - ustr-compiler.h | 4 ++-- - ustr-fmt-dbg-code.c | 8 ++++---- - ustr-fmt-opt-code.c | 8 ++++---- - ustr-ins-dbg-code.c | 8 ++++---- - ustr-ins-opt-code.c | 8 ++++---- - ustr-io-dbg-code.c | 8 ++++---- - ustr-io-opt-code.c | 8 ++++---- - ustr-main-dbg-code.c | 2 +- - ustr-main-opt-code.c | 2 +- - ustr-parse-dbg-code.c | 8 ++++---- - ustr-parse-opt-code.c | 8 ++++---- - ustr-pool-dbg-code.c | 8 ++++---- - ustr-pool-opt-code.c | 8 ++++---- - ustr-replace-dbg-code.c | 8 ++++---- - ustr-replace-opt-code.c | 8 ++++---- - ustr-sc-dbg-code.c | 8 ++++---- - ustr-sc-opt-code.c | 8 ++++---- - ustr-set-dbg-code.c | 8 ++++---- - ustr-set-opt-code.c | 8 ++++---- - ustr-split-dbg-code.c | 8 ++++---- - ustr-split-opt-code.c | 8 ++++---- - ustr-spn-dbg-code.c | 8 ++++---- - ustr-spn-opt-code.c | 8 ++++---- - ustr-srch-dbg-code.c | 8 ++++---- - ustr-srch-opt-code.c | 8 ++++---- - ustr-sub-dbg-code.c | 8 ++++---- - ustr-sub-opt-code.c | 8 ++++---- - ustr-utf8-dbg-code.c | 8 ++++---- - ustr-utf8-opt-code.c | 8 ++++---- - 33 files changed, 124 insertions(+), 124 deletions(-) - -diff --git a/ustr-b-dbg-code.c b/ustr-b-dbg-code.c -index 4a7fdac..60e383e 100644 ---- a/ustr-b-dbg-code.c -+++ b/ustr-b-dbg-code.c -@@ -3,11 +3,11 @@ - #include "ustr-conf-debug.h" - #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF - #define USTR_CONF_e_PROTO extern --#define USTR_CONF_i_PROTO extern inline -+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_E_PROTO extern --#define USTR_CONF_I_PROTO extern inline -+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_EI_PROTO extern --#define USTR_CONF_II_PROTO extern inline -+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline - #include "ustr-main.h" - #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS - #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 1 -@@ -16,5 +16,5 @@ - #undef USTR_CONF_I_PROTO - #define USTR_CONF_I_PROTO - #undef USTR_CONF_II_PROTO --#define USTR_CONF_II_PROTO inline -+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline - #include "ustr-b.h" -diff --git a/ustr-b-opt-code.c b/ustr-b-opt-code.c -index 45e9e87..4011898 100644 ---- a/ustr-b-opt-code.c -+++ b/ustr-b-opt-code.c -@@ -3,11 +3,11 @@ - #include "ustr-conf.h" - #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF - #define USTR_CONF_e_PROTO extern --#define USTR_CONF_i_PROTO extern inline -+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_E_PROTO extern --#define USTR_CONF_I_PROTO extern inline -+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_EI_PROTO extern --#define USTR_CONF_II_PROTO extern inline -+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline - #include "ustr-main.h" - #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS - #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 1 -@@ -16,5 +16,5 @@ - #undef USTR_CONF_I_PROTO - #define USTR_CONF_I_PROTO - #undef USTR_CONF_II_PROTO --#define USTR_CONF_II_PROTO inline -+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline - #include "ustr-b.h" -diff --git a/ustr-cmp-dbg-code.c b/ustr-cmp-dbg-code.c -index 7b8af33..4c3adc2 100644 ---- a/ustr-cmp-dbg-code.c -+++ b/ustr-cmp-dbg-code.c -@@ -3,11 +3,11 @@ - #include "ustr-conf-debug.h" - #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF - #define USTR_CONF_e_PROTO extern --#define USTR_CONF_i_PROTO extern inline -+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_E_PROTO extern --#define USTR_CONF_I_PROTO extern inline -+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_EI_PROTO extern --#define USTR_CONF_II_PROTO extern inline -+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline - #include "ustr-main.h" - #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS - #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 1 -@@ -16,5 +16,5 @@ - #undef USTR_CONF_I_PROTO - #define USTR_CONF_I_PROTO - #undef USTR_CONF_II_PROTO --#define USTR_CONF_II_PROTO inline -+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline - #include "ustr-cmp.h" -diff --git a/ustr-cmp-opt-code.c b/ustr-cmp-opt-code.c -index 2076d1c..ff5d02c 100644 ---- a/ustr-cmp-opt-code.c -+++ b/ustr-cmp-opt-code.c -@@ -3,11 +3,11 @@ - #include "ustr-conf.h" - #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF - #define USTR_CONF_e_PROTO extern --#define USTR_CONF_i_PROTO extern inline -+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_E_PROTO extern --#define USTR_CONF_I_PROTO extern inline -+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_EI_PROTO extern --#define USTR_CONF_II_PROTO extern inline -+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline - #include "ustr-main.h" - #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS - #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 1 -@@ -16,5 +16,5 @@ - #undef USTR_CONF_I_PROTO - #define USTR_CONF_I_PROTO - #undef USTR_CONF_II_PROTO --#define USTR_CONF_II_PROTO inline -+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline - #include "ustr-cmp.h" -diff --git a/ustr-compiler.h b/ustr-compiler.h -index 9e71276..38ae026 100644 ---- a/ustr-compiler.h -+++ b/ustr-compiler.h -@@ -92,7 +92,7 @@ - #endif - - #if USTR_CONF_COMPILE_USE_INLINE --#define USTR__INLINE inline -+#define USTR__INLINE __attribute__ ((gnu_inline)) inline - #else - #define USTR__INLINE /* no inline */ - #endif -diff --git a/ustr-fmt-dbg-code.c b/ustr-fmt-dbg-code.c -index 4249bb1..1f147a0 100644 ---- a/ustr-fmt-dbg-code.c -+++ b/ustr-fmt-dbg-code.c -@@ -3,11 +3,11 @@ - #include "ustr-conf-debug.h" - #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF - #define USTR_CONF_e_PROTO extern --#define USTR_CONF_i_PROTO extern inline -+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_E_PROTO extern --#define USTR_CONF_I_PROTO extern inline -+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_EI_PROTO extern --#define USTR_CONF_II_PROTO extern inline -+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline - #include "ustr-main.h" - #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS - #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 1 -@@ -16,5 +16,5 @@ - #undef USTR_CONF_I_PROTO - #define USTR_CONF_I_PROTO - #undef USTR_CONF_II_PROTO --#define USTR_CONF_II_PROTO inline -+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline - #include "ustr-fmt.h" -diff --git a/ustr-fmt-opt-code.c b/ustr-fmt-opt-code.c -index c73e375..989b29f 100644 ---- a/ustr-fmt-opt-code.c -+++ b/ustr-fmt-opt-code.c -@@ -3,11 +3,11 @@ - #include "ustr-conf.h" - #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF - #define USTR_CONF_e_PROTO extern --#define USTR_CONF_i_PROTO extern inline -+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_E_PROTO extern --#define USTR_CONF_I_PROTO extern inline -+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_EI_PROTO extern --#define USTR_CONF_II_PROTO extern inline -+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline - #include "ustr-main.h" - #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS - #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 1 -@@ -16,5 +16,5 @@ - #undef USTR_CONF_I_PROTO - #define USTR_CONF_I_PROTO - #undef USTR_CONF_II_PROTO --#define USTR_CONF_II_PROTO inline -+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline - #include "ustr-fmt.h" -diff --git a/ustr-ins-dbg-code.c b/ustr-ins-dbg-code.c -index 39f9bba..4c6d5ea 100644 ---- a/ustr-ins-dbg-code.c -+++ b/ustr-ins-dbg-code.c -@@ -3,11 +3,11 @@ - #include "ustr-conf-debug.h" - #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF - #define USTR_CONF_e_PROTO extern --#define USTR_CONF_i_PROTO extern inline -+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_E_PROTO extern --#define USTR_CONF_I_PROTO extern inline -+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_EI_PROTO extern --#define USTR_CONF_II_PROTO extern inline -+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline - #include "ustr-main.h" - #include "ustr-fmt.h" - #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS -@@ -17,5 +17,5 @@ - #undef USTR_CONF_I_PROTO - #define USTR_CONF_I_PROTO - #undef USTR_CONF_II_PROTO --#define USTR_CONF_II_PROTO inline -+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline - #include "ustr-ins.h" -diff --git a/ustr-ins-opt-code.c b/ustr-ins-opt-code.c -index 1aca827..859b44d 100644 ---- a/ustr-ins-opt-code.c -+++ b/ustr-ins-opt-code.c -@@ -3,11 +3,11 @@ - #include "ustr-conf.h" - #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF - #define USTR_CONF_e_PROTO extern --#define USTR_CONF_i_PROTO extern inline -+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_E_PROTO extern --#define USTR_CONF_I_PROTO extern inline -+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_EI_PROTO extern --#define USTR_CONF_II_PROTO extern inline -+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline - #include "ustr-main.h" - #include "ustr-fmt.h" - #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS -@@ -17,5 +17,5 @@ - #undef USTR_CONF_I_PROTO - #define USTR_CONF_I_PROTO - #undef USTR_CONF_II_PROTO --#define USTR_CONF_II_PROTO inline -+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline - #include "ustr-ins.h" -diff --git a/ustr-io-dbg-code.c b/ustr-io-dbg-code.c -index c361c93..d42e43f 100644 ---- a/ustr-io-dbg-code.c -+++ b/ustr-io-dbg-code.c -@@ -3,11 +3,11 @@ - #include "ustr-conf-debug.h" - #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF - #define USTR_CONF_e_PROTO extern --#define USTR_CONF_i_PROTO extern inline -+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_E_PROTO extern --#define USTR_CONF_I_PROTO extern inline -+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_EI_PROTO extern --#define USTR_CONF_II_PROTO extern inline -+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline - #include "ustr-main.h" - #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS - #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 1 -@@ -16,5 +16,5 @@ - #undef USTR_CONF_I_PROTO - #define USTR_CONF_I_PROTO - #undef USTR_CONF_II_PROTO --#define USTR_CONF_II_PROTO inline -+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline - #include "ustr-io.h" -diff --git a/ustr-io-opt-code.c b/ustr-io-opt-code.c -index b1b4525..ae8de87 100644 ---- a/ustr-io-opt-code.c -+++ b/ustr-io-opt-code.c -@@ -3,11 +3,11 @@ - #include "ustr-conf.h" - #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF - #define USTR_CONF_e_PROTO extern --#define USTR_CONF_i_PROTO extern inline -+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_E_PROTO extern --#define USTR_CONF_I_PROTO extern inline -+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_EI_PROTO extern --#define USTR_CONF_II_PROTO extern inline -+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline - #include "ustr-main.h" - #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS - #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 1 -@@ -16,5 +16,5 @@ - #undef USTR_CONF_I_PROTO - #define USTR_CONF_I_PROTO - #undef USTR_CONF_II_PROTO --#define USTR_CONF_II_PROTO inline -+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline - #include "ustr-io.h" -diff --git a/ustr-main-dbg-code.c b/ustr-main-dbg-code.c -index 4b821ce..abaa53a 100644 ---- a/ustr-main-dbg-code.c -+++ b/ustr-main-dbg-code.c -@@ -7,5 +7,5 @@ - #define USTR_CONF_E_PROTO extern - #define USTR_CONF_I_PROTO - #define USTR_CONF_EI_PROTO extern --#define USTR_CONF_II_PROTO inline -+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline - #include "ustr-main.h" -diff --git a/ustr-main-opt-code.c b/ustr-main-opt-code.c -index 233fb60..7ef6e98 100644 ---- a/ustr-main-opt-code.c -+++ b/ustr-main-opt-code.c -@@ -7,5 +7,5 @@ - #define USTR_CONF_E_PROTO extern - #define USTR_CONF_I_PROTO - #define USTR_CONF_EI_PROTO extern --#define USTR_CONF_II_PROTO inline -+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline - #include "ustr-main.h" -diff --git a/ustr-parse-dbg-code.c b/ustr-parse-dbg-code.c -index c9653af..6e1707d 100644 ---- a/ustr-parse-dbg-code.c -+++ b/ustr-parse-dbg-code.c -@@ -3,11 +3,11 @@ - #include "ustr-conf-debug.h" - #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF - #define USTR_CONF_e_PROTO extern --#define USTR_CONF_i_PROTO extern inline -+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_E_PROTO extern --#define USTR_CONF_I_PROTO extern inline -+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_EI_PROTO extern --#define USTR_CONF_II_PROTO extern inline -+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline - #include "ustr-main.h" - #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS - #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 1 -@@ -16,5 +16,5 @@ - #undef USTR_CONF_I_PROTO - #define USTR_CONF_I_PROTO - #undef USTR_CONF_II_PROTO --#define USTR_CONF_II_PROTO inline -+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline - #include "ustr-parse.h" -diff --git a/ustr-parse-opt-code.c b/ustr-parse-opt-code.c -index 0c8df4d..fc96db2 100644 ---- a/ustr-parse-opt-code.c -+++ b/ustr-parse-opt-code.c -@@ -3,11 +3,11 @@ - #include "ustr-conf.h" - #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF - #define USTR_CONF_e_PROTO extern --#define USTR_CONF_i_PROTO extern inline -+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_E_PROTO extern --#define USTR_CONF_I_PROTO extern inline -+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_EI_PROTO extern --#define USTR_CONF_II_PROTO extern inline -+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline - #include "ustr-main.h" - #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS - #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 1 -@@ -16,5 +16,5 @@ - #undef USTR_CONF_I_PROTO - #define USTR_CONF_I_PROTO - #undef USTR_CONF_II_PROTO --#define USTR_CONF_II_PROTO inline -+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline - #include "ustr-parse.h" -diff --git a/ustr-pool-dbg-code.c b/ustr-pool-dbg-code.c -index adf7519..957f9ca 100644 ---- a/ustr-pool-dbg-code.c -+++ b/ustr-pool-dbg-code.c -@@ -3,11 +3,11 @@ - #include "ustr-conf-debug.h" - #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF - #define USTR_CONF_e_PROTO extern --#define USTR_CONF_i_PROTO extern inline -+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_E_PROTO extern --#define USTR_CONF_I_PROTO extern inline -+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_EI_PROTO extern --#define USTR_CONF_II_PROTO extern inline -+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline - #include "ustr-main.h" - #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS - #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 1 -@@ -16,5 +16,5 @@ - #undef USTR_CONF_I_PROTO - #define USTR_CONF_I_PROTO - #undef USTR_CONF_II_PROTO --#define USTR_CONF_II_PROTO inline -+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline - #include "ustr-pool.h" -diff --git a/ustr-pool-opt-code.c b/ustr-pool-opt-code.c -index 2b0367c..c1b2413 100644 ---- a/ustr-pool-opt-code.c -+++ b/ustr-pool-opt-code.c -@@ -3,11 +3,11 @@ - #include "ustr-conf.h" - #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF - #define USTR_CONF_e_PROTO extern --#define USTR_CONF_i_PROTO extern inline -+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_E_PROTO extern --#define USTR_CONF_I_PROTO extern inline -+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_EI_PROTO extern --#define USTR_CONF_II_PROTO extern inline -+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline - #include "ustr-main.h" - #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS - #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 1 -@@ -16,5 +16,5 @@ - #undef USTR_CONF_I_PROTO - #define USTR_CONF_I_PROTO - #undef USTR_CONF_II_PROTO --#define USTR_CONF_II_PROTO inline -+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline - #include "ustr-pool.h" -diff --git a/ustr-replace-dbg-code.c b/ustr-replace-dbg-code.c -index fe02187..90531ac 100644 ---- a/ustr-replace-dbg-code.c -+++ b/ustr-replace-dbg-code.c -@@ -3,11 +3,11 @@ - #include "ustr-conf-debug.h" - #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF - #define USTR_CONF_e_PROTO extern --#define USTR_CONF_i_PROTO extern inline -+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_E_PROTO extern --#define USTR_CONF_I_PROTO extern inline -+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_EI_PROTO extern --#define USTR_CONF_II_PROTO extern inline -+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline - #include "ustr-main.h" - #include "ustr-set.h" - #include "ustr-srch.h" -@@ -19,5 +19,5 @@ - #undef USTR_CONF_I_PROTO - #define USTR_CONF_I_PROTO - #undef USTR_CONF_II_PROTO --#define USTR_CONF_II_PROTO inline -+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline - #include "ustr-replace.h" -diff --git a/ustr-replace-opt-code.c b/ustr-replace-opt-code.c -index e76b3bb..6232753 100644 ---- a/ustr-replace-opt-code.c -+++ b/ustr-replace-opt-code.c -@@ -3,11 +3,11 @@ - #include "ustr-conf.h" - #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF - #define USTR_CONF_e_PROTO extern --#define USTR_CONF_i_PROTO extern inline -+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_E_PROTO extern --#define USTR_CONF_I_PROTO extern inline -+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_EI_PROTO extern --#define USTR_CONF_II_PROTO extern inline -+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline - #include "ustr-main.h" - #include "ustr-set.h" - #include "ustr-srch.h" -@@ -19,5 +19,5 @@ - #undef USTR_CONF_I_PROTO - #define USTR_CONF_I_PROTO - #undef USTR_CONF_II_PROTO --#define USTR_CONF_II_PROTO inline -+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline - #include "ustr-replace.h" -diff --git a/ustr-sc-dbg-code.c b/ustr-sc-dbg-code.c -index 0011c63..d7ce317 100644 ---- a/ustr-sc-dbg-code.c -+++ b/ustr-sc-dbg-code.c -@@ -3,11 +3,11 @@ - #include "ustr-conf-debug.h" - #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF - #define USTR_CONF_e_PROTO extern --#define USTR_CONF_i_PROTO extern inline -+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_E_PROTO extern --#define USTR_CONF_I_PROTO extern inline -+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_EI_PROTO extern --#define USTR_CONF_II_PROTO extern inline -+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline - #include "ustr-main.h" - #include "ustr-spn.h" - #include "ustr-utf8.h" -@@ -18,5 +18,5 @@ - #undef USTR_CONF_I_PROTO - #define USTR_CONF_I_PROTO - #undef USTR_CONF_II_PROTO --#define USTR_CONF_II_PROTO inline -+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline - #include "ustr-sc.h" -diff --git a/ustr-sc-opt-code.c b/ustr-sc-opt-code.c -index 7cb81ba..4a97ed9 100644 ---- a/ustr-sc-opt-code.c -+++ b/ustr-sc-opt-code.c -@@ -3,11 +3,11 @@ - #include "ustr-conf.h" - #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF - #define USTR_CONF_e_PROTO extern --#define USTR_CONF_i_PROTO extern inline -+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_E_PROTO extern --#define USTR_CONF_I_PROTO extern inline -+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_EI_PROTO extern --#define USTR_CONF_II_PROTO extern inline -+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline - #include "ustr-main.h" - #include "ustr-spn.h" - #include "ustr-utf8.h" -@@ -18,5 +18,5 @@ - #undef USTR_CONF_I_PROTO - #define USTR_CONF_I_PROTO - #undef USTR_CONF_II_PROTO --#define USTR_CONF_II_PROTO inline -+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline - #include "ustr-sc.h" -diff --git a/ustr-set-dbg-code.c b/ustr-set-dbg-code.c -index 023875a..cf77071 100644 ---- a/ustr-set-dbg-code.c -+++ b/ustr-set-dbg-code.c -@@ -3,11 +3,11 @@ - #include "ustr-conf-debug.h" - #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF - #define USTR_CONF_e_PROTO extern --#define USTR_CONF_i_PROTO extern inline -+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_E_PROTO extern --#define USTR_CONF_I_PROTO extern inline -+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_EI_PROTO extern --#define USTR_CONF_II_PROTO extern inline -+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline - #include "ustr-main.h" - #include "ustr-fmt.h" - #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS -@@ -17,5 +17,5 @@ - #undef USTR_CONF_I_PROTO - #define USTR_CONF_I_PROTO - #undef USTR_CONF_II_PROTO --#define USTR_CONF_II_PROTO inline -+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline - #include "ustr-set.h" -diff --git a/ustr-set-opt-code.c b/ustr-set-opt-code.c -index e726888..34dcaf6 100644 ---- a/ustr-set-opt-code.c -+++ b/ustr-set-opt-code.c -@@ -3,11 +3,11 @@ - #include "ustr-conf.h" - #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF - #define USTR_CONF_e_PROTO extern --#define USTR_CONF_i_PROTO extern inline -+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_E_PROTO extern --#define USTR_CONF_I_PROTO extern inline -+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_EI_PROTO extern --#define USTR_CONF_II_PROTO extern inline -+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline - #include "ustr-main.h" - #include "ustr-fmt.h" - #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS -@@ -17,5 +17,5 @@ - #undef USTR_CONF_I_PROTO - #define USTR_CONF_I_PROTO - #undef USTR_CONF_II_PROTO --#define USTR_CONF_II_PROTO inline -+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline - #include "ustr-set.h" -diff --git a/ustr-split-dbg-code.c b/ustr-split-dbg-code.c -index 03e5ca5..e40d2a5 100644 ---- a/ustr-split-dbg-code.c -+++ b/ustr-split-dbg-code.c -@@ -3,11 +3,11 @@ - #include "ustr-conf-debug.h" - #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF - #define USTR_CONF_e_PROTO extern --#define USTR_CONF_i_PROTO extern inline -+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_E_PROTO extern --#define USTR_CONF_I_PROTO extern inline -+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_EI_PROTO extern --#define USTR_CONF_II_PROTO extern inline -+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline - #include "ustr-main.h" - #include "ustr-set.h" - #include "ustr-spn.h" -@@ -19,5 +19,5 @@ - #undef USTR_CONF_I_PROTO - #define USTR_CONF_I_PROTO - #undef USTR_CONF_II_PROTO --#define USTR_CONF_II_PROTO inline -+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline - #include "ustr-split.h" -diff --git a/ustr-split-opt-code.c b/ustr-split-opt-code.c -index d64e300..74f4b1c 100644 ---- a/ustr-split-opt-code.c -+++ b/ustr-split-opt-code.c -@@ -3,11 +3,11 @@ - #include "ustr-conf.h" - #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF - #define USTR_CONF_e_PROTO extern --#define USTR_CONF_i_PROTO extern inline -+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_E_PROTO extern --#define USTR_CONF_I_PROTO extern inline -+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_EI_PROTO extern --#define USTR_CONF_II_PROTO extern inline -+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline - #include "ustr-main.h" - #include "ustr-set.h" - #include "ustr-spn.h" -@@ -19,5 +19,5 @@ - #undef USTR_CONF_I_PROTO - #define USTR_CONF_I_PROTO - #undef USTR_CONF_II_PROTO --#define USTR_CONF_II_PROTO inline -+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline - #include "ustr-split.h" -diff --git a/ustr-spn-dbg-code.c b/ustr-spn-dbg-code.c -index ff97432..b0b09d4 100644 ---- a/ustr-spn-dbg-code.c -+++ b/ustr-spn-dbg-code.c -@@ -3,11 +3,11 @@ - #include "ustr-conf-debug.h" - #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF - #define USTR_CONF_e_PROTO extern --#define USTR_CONF_i_PROTO extern inline -+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_E_PROTO extern --#define USTR_CONF_I_PROTO extern inline -+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_EI_PROTO extern --#define USTR_CONF_II_PROTO extern inline -+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline - #include "ustr-main.h" - #include "ustr-srch.h" - #include "ustr-utf8.h" -@@ -18,5 +18,5 @@ - #undef USTR_CONF_I_PROTO - #define USTR_CONF_I_PROTO - #undef USTR_CONF_II_PROTO --#define USTR_CONF_II_PROTO inline -+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline - #include "ustr-spn.h" -diff --git a/ustr-spn-opt-code.c b/ustr-spn-opt-code.c -index 3ff0a07..92c5ccc 100644 ---- a/ustr-spn-opt-code.c -+++ b/ustr-spn-opt-code.c -@@ -3,11 +3,11 @@ - #include "ustr-conf.h" - #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF - #define USTR_CONF_e_PROTO extern --#define USTR_CONF_i_PROTO extern inline -+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_E_PROTO extern --#define USTR_CONF_I_PROTO extern inline -+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_EI_PROTO extern --#define USTR_CONF_II_PROTO extern inline -+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline - #include "ustr-main.h" - #include "ustr-srch.h" - #include "ustr-utf8.h" -@@ -18,5 +18,5 @@ - #undef USTR_CONF_I_PROTO - #define USTR_CONF_I_PROTO - #undef USTR_CONF_II_PROTO --#define USTR_CONF_II_PROTO inline -+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline - #include "ustr-spn.h" -diff --git a/ustr-srch-dbg-code.c b/ustr-srch-dbg-code.c -index 40e4dbf..0f4da21 100644 ---- a/ustr-srch-dbg-code.c -+++ b/ustr-srch-dbg-code.c -@@ -3,11 +3,11 @@ - #include "ustr-conf-debug.h" - #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF - #define USTR_CONF_e_PROTO extern --#define USTR_CONF_i_PROTO extern inline -+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_E_PROTO extern --#define USTR_CONF_I_PROTO extern inline -+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_EI_PROTO extern --#define USTR_CONF_II_PROTO extern inline -+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline - #include "ustr-main.h" - #include "ustr-cmp-internal.h" - #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS -@@ -17,6 +17,6 @@ - #undef USTR_CONF_I_PROTO - #define USTR_CONF_I_PROTO - #undef USTR_CONF_II_PROTO --#define USTR_CONF_II_PROTO inline -+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline - #include "ustr-srch.h" - -diff --git a/ustr-srch-opt-code.c b/ustr-srch-opt-code.c -index 635464d..8dde13d 100644 ---- a/ustr-srch-opt-code.c -+++ b/ustr-srch-opt-code.c -@@ -3,11 +3,11 @@ - #include "ustr-conf.h" - #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF - #define USTR_CONF_e_PROTO extern --#define USTR_CONF_i_PROTO extern inline -+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_E_PROTO extern --#define USTR_CONF_I_PROTO extern inline -+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_EI_PROTO extern --#define USTR_CONF_II_PROTO extern inline -+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline - #include "ustr-main.h" - #include "ustr-cmp-internal.h" - #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS -@@ -17,6 +17,6 @@ - #undef USTR_CONF_I_PROTO - #define USTR_CONF_I_PROTO - #undef USTR_CONF_II_PROTO --#define USTR_CONF_II_PROTO inline -+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline - #include "ustr-srch.h" - -diff --git a/ustr-sub-dbg-code.c b/ustr-sub-dbg-code.c -index f994716..b1712e6 100644 ---- a/ustr-sub-dbg-code.c -+++ b/ustr-sub-dbg-code.c -@@ -3,11 +3,11 @@ - #include "ustr-conf-debug.h" - #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF - #define USTR_CONF_e_PROTO extern --#define USTR_CONF_i_PROTO extern inline -+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_E_PROTO extern --#define USTR_CONF_I_PROTO extern inline -+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_EI_PROTO extern --#define USTR_CONF_II_PROTO extern inline -+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline - #include "ustr-main.h" - #include "ustr-fmt.h" - #include "ustr-ins.h" -@@ -19,5 +19,5 @@ - #undef USTR_CONF_I_PROTO - #define USTR_CONF_I_PROTO - #undef USTR_CONF_II_PROTO --#define USTR_CONF_II_PROTO inline -+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline - #include "ustr-sub.h" -diff --git a/ustr-sub-opt-code.c b/ustr-sub-opt-code.c -index 8cdb4eb..91780c7 100644 ---- a/ustr-sub-opt-code.c -+++ b/ustr-sub-opt-code.c -@@ -3,11 +3,11 @@ - #include "ustr-conf.h" - #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF - #define USTR_CONF_e_PROTO extern --#define USTR_CONF_i_PROTO extern inline -+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_E_PROTO extern --#define USTR_CONF_I_PROTO extern inline -+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_EI_PROTO extern --#define USTR_CONF_II_PROTO extern inline -+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline - #include "ustr-main.h" - #include "ustr-fmt.h" - #include "ustr-ins.h" -@@ -19,5 +19,5 @@ - #undef USTR_CONF_I_PROTO - #define USTR_CONF_I_PROTO - #undef USTR_CONF_II_PROTO --#define USTR_CONF_II_PROTO inline -+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline - #include "ustr-sub.h" -diff --git a/ustr-utf8-dbg-code.c b/ustr-utf8-dbg-code.c -index 2666fc2..30786e9 100644 ---- a/ustr-utf8-dbg-code.c -+++ b/ustr-utf8-dbg-code.c -@@ -3,11 +3,11 @@ - #include "ustr-conf-debug.h" - #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF - #define USTR_CONF_e_PROTO extern --#define USTR_CONF_i_PROTO extern inline -+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_E_PROTO extern --#define USTR_CONF_I_PROTO extern inline -+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_EI_PROTO extern --#define USTR_CONF_II_PROTO extern inline -+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline - #include "ustr-main.h" - #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS - #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 1 -@@ -16,5 +16,5 @@ - #undef USTR_CONF_I_PROTO - #define USTR_CONF_I_PROTO - #undef USTR_CONF_II_PROTO --#define USTR_CONF_II_PROTO inline -+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline - #include "ustr-utf8.h" -diff --git a/ustr-utf8-opt-code.c b/ustr-utf8-opt-code.c -index 91fa754..abdf4c0 100644 ---- a/ustr-utf8-opt-code.c -+++ b/ustr-utf8-opt-code.c -@@ -3,11 +3,11 @@ - #include "ustr-conf.h" - #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF - #define USTR_CONF_e_PROTO extern --#define USTR_CONF_i_PROTO extern inline -+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_E_PROTO extern --#define USTR_CONF_I_PROTO extern inline -+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline - #define USTR_CONF_EI_PROTO extern --#define USTR_CONF_II_PROTO extern inline -+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline - #include "ustr-main.h" - #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS - #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 1 -@@ -16,5 +16,5 @@ - #undef USTR_CONF_I_PROTO - #define USTR_CONF_I_PROTO - #undef USTR_CONF_II_PROTO --#define USTR_CONF_II_PROTO inline -+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline - #include "ustr-utf8.h" --- -tg: (b148fb7..) fixes/gnu-inline (depends on: upstream) diff --git a/recipes-extended/ustr/ustr/ustr-makefile-fix.patch b/recipes-extended/ustr/ustr/ustr-makefile-fix.patch deleted file mode 100644 index b07e746..0000000 --- a/recipes-extended/ustr/ustr/ustr-makefile-fix.patch +++ /dev/null @@ -1,215 +0,0 @@ ---- - Makefile | 109 ++++++++++++++++++++++++++------------------------------------- - 1 file changed, 46 insertions(+), 63 deletions(-) - ---- a/Makefile -+++ b/Makefile -@@ -7,35 +7,36 @@ VERS_FULL=$(VERS).4 - VERS_BSO =1.0 - VERS_ESONAME =1 - VERS_ESO =$(VERS_ESONAME).0.4 - - DESTDIR = --prefix=/usr --datadir=$(prefix)/share --libdir=$(prefix)/lib --libexecdir=$(prefix)/libexec --bindir=$(prefix)/bin --includedir=$(prefix)/include --SHRDIR=$(datadir)/ustr-$(VERS_FULL) --DOCSHRDIR=$(datadir)/doc/ustr-devel-$(VERS_FULL) --EXAMDIR=$(SHRDIR)/examples --mandir=$(datadir)/doc/man --MBINDIR=$(libexecdir)/ustr-$(VERS_FULL) -+prefix ?= /usr -+datadir ?= $(prefix)/share -+libdir ?= $(prefix)/lib -+libexecdir ?= $(prefix)/libexec -+bindir ?= $(prefix)/bin -+includedir ?= $(prefix)/include -+SHRDIR ?= $(datadir)/ustr-$(VERS_FULL) -+DOCSHRDIR ?= $(datadir)/doc/ustr-devel-$(VERS_FULL) -+EXAMDIR ?= $(SHRDIR)/examples -+mandir ?=$(datadir)/doc/man -+MBINDIR ?=$(libexecdir)/ustr-$(VERS_FULL) - - ############################################################################### - # This is here to work around the "Fedora build system requirement" that a big - # pile of crap ends up in the build.log file even though all sane people don't - # want that. See rhbz#248231 - ############################################################################### --HIDE=@ -+#HIDE=@ - --CC = cc --AR = ar --RANLIB = ranlib --LDCONFIG = /sbin/ldconfig -+vsnp ?= 0 -+CC ?= cc -+AR ?= ar -+RANLIB ?= ranlib -+LDCONFIG ?= /sbin/ldconfig - --CFLAGS = -O2 -g -+CFLAGS ?= -O2 -g - - # Debug versions... - WARNS = -W -Wall -Wundef -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wno-format-zero-length -Wformat-nonliteral -Wformat-security # -Wfloat-equal -- no floats - # Fedora policies/"reviewers" are completely retarded and refuse to allow - # lowering the "Fedora build flags" even when it activley hurts their users, -@@ -386,48 +387,46 @@ install: all-shared ustr.pc ustr-debug.p - install -d $(DESTDIR)$(mandir)/man1 - install -d $(DESTDIR)$(mandir)/man3 - install -d $(DESTDIR)$(bindir) - install -d $(DESTDIR)$(libdir)/pkgconfig - $(HIDE)echo Installing files -- install -m 644 -t $(DESTDIR)$(libdir) $(LIB_STATIC) -- install -m 755 -t $(DESTDIR)$(libdir) $(LIB_SHARED) -+ install -m 644 $(LIB_STATIC) $(DESTDIR)$(libdir) -+ install -m 755 $(LIB_SHARED) $(DESTDIR)$(libdir) - -rm -f $(DESTDIR)$(libdir)/$(OPT_LIB_SHARED_NAME) - ln -s $(OPT_LIB_SHARED) $(DESTDIR)$(libdir)/$(OPT_LIB_SHARED_NAME) - -rm -f $(DESTDIR)$(libdir)/$(OPT_LIB_SHAREDEV) - ln -s $(OPT_LIB_SHARED_NAME) $(DESTDIR)$(libdir)/$(OPT_LIB_SHAREDEV) - -rm -f $(DESTDIR)$(libdir)/$(DBG_LIB_SHARED_NAME) - ln -s $(DBG_LIB_SHARED) $(DESTDIR)$(libdir)/$(DBG_LIB_SHARED_NAME) - -rm -f $(DESTDIR)$(libdir)/$(DBG_LIB_SHAREDEV) - ln -s $(DBG_LIB_SHARED_NAME) $(DESTDIR)$(libdir)/$(DBG_LIB_SHAREDEV) - $(LDCONFIG) -n $(DESTDIR)$(libdir) -- install -pm 644 -t $(DESTDIR)$(includedir) $(SRC_HDRS) -- install -pm 644 -t $(DESTDIR)$(SHRDIR) $(SRC_SRCS) -- install -pm 644 -t $(DESTDIR)$(SHRDIR) $(XSRC_SRCS) -- install -pm 644 -t $(DESTDIR)$(DOCSHRDIR) $(DOCS) -- install -pm 644 -t $(DESTDIR)$(EXAMDIR) $(EXAMPLES) -- install -pm 644 -t $(DESTDIR)$(mandir)/man1 $(MAN_PAGES_1) -- install -pm 644 -t $(DESTDIR)$(mandir)/man3 $(MAN_PAGES_3) -- install -m 755 -t $(DESTDIR)$(bindir) ustr-import -- install -pm 644 -t $(DESTDIR)$(libdir)/pkgconfig ustr.pc ustr-debug.pc -+ install -pm 644 $(SRC_HDRS) $(DESTDIR)$(includedir) -+ install -pm 644 $(SRC_SRCS) $(DESTDIR)$(SHRDIR) -+ install -pm 644 $(XSRC_SRCS) $(DESTDIR)$(SHRDIR) -+ install -pm 644 $(DOCS) $(DESTDIR)$(DOCSHRDIR) -+ install -pm 644 $(EXAMPLES) $(DESTDIR)$(EXAMDIR) -+ install -pm 644 $(MAN_PAGES_1) $(DESTDIR)$(mandir)/man1 -+ install -pm 644 $(MAN_PAGES_3) $(DESTDIR)$(mandir)/man3 -+ install -m 755 ustr-import $(DESTDIR)$(bindir) -+ install -pm 644 ustr.pc ustr-debug.pc $(DESTDIR)$(libdir)/pkgconfig - - ustr-import-multilib: ustr-import-multilib.in - sed -e 's,@INCLUDEDIR@,$(includedir),g' -e 's,@MBINDIR@,$(MBINDIR),g' < $< > $@ - --install-multilib-linux: install autoconf_64b ustr-import-multilib -+install-multilib-linux: install ustr-import-multilib - install -d $(DESTDIR)$(MBINDIR) -- $(HIDE)mlib=`./autoconf_64b`; \ -- if test "x$$mlib" = "x1"; then mlib=64; else mlib=32; fi; \ -- mv -f $(DESTDIR)$(includedir)/ustr-conf-debug.h \ -- $(DESTDIR)$(includedir)/ustr-conf-debug-$$mlib.h; \ -+ mv -f $(DESTDIR)$(includedir)/ustr-conf-debug.h \ -+ $(DESTDIR)$(includedir)/ustr-conf-debug-$(mlib).h; \ - mv -f $(DESTDIR)$(includedir)/ustr-conf.h \ -- $(DESTDIR)$(includedir)/ustr-conf-$$mlib.h; \ -+ $(DESTDIR)$(includedir)/ustr-conf-$(mlib).h; \ - mv -f $(DESTDIR)$(bindir)/ustr-import \ -- $(DESTDIR)$(MBINDIR)/ustr-import-$$mlib -- install -m 644 -t $(DESTDIR)$(includedir) $(SRC_HDRS_MULTI_LIB) -+ $(DESTDIR)$(MBINDIR)/ustr-import-$(mlib) -+ install -m 644 $(SRC_HDRS_MULTI_LIB) $(DESTDIR)$(includedir) - $(HIDE)mv -f $(DESTDIR)$(includedir)/ustr-conf-debug-multilib-linux.h $(DESTDIR)$(includedir)/ustr-conf-debug.h - $(HIDE)mv -f $(DESTDIR)$(includedir)/ustr-conf-multilib-linux.h $(DESTDIR)$(includedir)/ustr-conf.h -- install -m 755 -t $(DESTDIR)$(bindir) ustr-import-multilib -+ install -m 755 ustr-import-multilib $(DESTDIR)$(bindir) - $(HIDE)mv -f $(DESTDIR)$(bindir)/ustr-import-multilib $(DESTDIR)$(bindir)/ustr-import - $(HIDE)touch --reference ustr-conf-multilib-linux.h $(DESTDIR)$(includedir)/ustr-conf.h - $(HIDE)touch --reference ustr-conf-debug-multilib-linux.h $(DESTDIR)$(includedir)/ustr-conf-debug.h - $(HIDE)touch --reference ustr-import-multilib.in $(DESTDIR)$(bindir)/ustr-import - -@@ -442,31 +441,20 @@ clean: - $(HIDE)rm -f tst_*.c ctst_*.c otst_*.c octst_*.c - $(HIDE)rm -f ustr-import-multilib - - distclean: clean - rm -f ustr-import -- rm -f autoconf_64b autoconf_vsnprintf - rm -f ustr-conf.h ustr-conf-debug.h - rm -rf lcov-output - - --ustr-import: ustr-import.in autoconf_64b autoconf_vsnprintf -+ustr-import: ustr-import.in - $(HIDE)echo Creating $@ -- $(HIDE)sz64=`./autoconf_64b`; vsnp=`./autoconf_vsnprintf`; \ -- sed -e 's,@INCLUDEDIR@,$(includedir),g' -e 's,@SHRDIR@,$(SHRDIR),g' -e 's,@VERS@,$(VERS),g' -e 's,@VERS_FULL@,$(VERS_FULL),g' -e "s,@HAVE_64bit_SIZE_MAX@,$$sz64,g" -e "s,@HAVE_RETARDED_VSNPRINTF@,$$vsnp,g" < $< > $@ -+ $(HIDE)if test "$(mlib)" = "64" ; then sz64=1; else sz64=0; fi; \ -+ sed -e 's,@INCLUDEDIR@,$(includedir),g' -e 's,@SHRDIR@,$(SHRDIR),g' -e 's,@VERS@,$(VERS),g' -e 's,@VERS_FULL@,$(VERS_FULL),g' -e "s,@HAVE_64bit_SIZE_MAX@,$$sz64,g" -e "s,@HAVE_RETARDED_VSNPRINTF@,$(vsnp),g" < $< > $@ - $(HIDE)chmod 755 $@ - --# Use CFLAGS so that CFLAGS="... -m32" does the right thing --autoconf_64b: autoconf_64b.c -- $(HIDE)echo Compiling: auto configuration test: 64bit -- $(HIDE)$(CC) $(CFLAGS) -o $@ $< -- --autoconf_vsnprintf: autoconf_vsnprintf.c -- $(HIDE)echo Compiling: auto configuration test: vsnprintf -- $(HIDE)$(CC) -o $@ $< -- --# Use LDFLAGS for LDFLAGS="-m32" - $(OPT_LIB_SHARED): $(LIB_SHARED_OPT) - $(HIDE)echo Linking SO OPT lib: $@ - $(HIDE)$(CC) -shared $^ -Wl,-soname -Wl,$(OPT_LIB_SHARED_NAME) -Wl,-version-script -Wl,libustr.ver $(LDFLAGS) -o $@ - - $(DBG_LIB_SHARED): $(LIB_SHARED_DBG) -@@ -480,46 +468,40 @@ libustr.a: $(LIB_STATIC_OPT) - libustr-debug.a: $(LIB_STATIC_DBG) - $(HIDE)echo Linking A DBG lib: $@ - $(HIDE)$(AR) ru $@ $^ - $(HIDE)$(RANLIB) $@ - --ustr-conf.h: ustr-conf.h.in autoconf_64b autoconf_vsnprintf -+ustr-conf.h: ustr-conf.h.in - $(HIDE)echo Creating $@ - $(HIDE)have_stdint_h=0; dbg1=0; dbg2=0; \ -- sz64=`./autoconf_64b`; vsnp=`./autoconf_vsnprintf`; \ -- if test -f "/usr/include/stdint.h"; then have_stdint_h=1; fi; \ -+ $(HIDE)if test "$(mlib)" = "64" ; then sz64=1; else sz64=0; fi; \ - if test -f "$(prefix)/include/stdint.h"; then have_stdint_h=1; fi; \ - if test -f "$(includedir)/stdint.h"; then have_stdint_h=1; fi; \ -- sed -e "s,@HAVE_STDINT_H@,$$have_stdint_h,g" -e "s,@USE_ASSERT@,$$dbg1,g" -e "s,@USE_EOS_MARK@,$$dbg2,g" -e "s,@HAVE_64bit_SIZE_MAX@,$$sz64,g" -e "s,@HAVE_RETARDED_VSNPRINTF@,$$vsnp,g" < $< > $@ -+ sed -e "s,@HAVE_STDINT_H@,$$have_stdint_h,g" -e "s,@USE_ASSERT@,$$dbg1,g" -e "s,@USE_EOS_MARK@,$$dbg2,g" -e "s,@HAVE_64bit_SIZE_MAX@,$$sz64,g" -e "s,@HAVE_RETARDED_VSNPRINTF@,$(vsnp),g" < $< > $@ - --ustr-conf-debug.h: ustr-conf.h.in autoconf_64b autoconf_vsnprintf -+ustr-conf-debug.h: ustr-conf.h.in - $(HIDE)echo Creating $@ - $(HIDE)have_stdint_h=0; dbg1=1; dbg2=1; \ -- sz64=`./autoconf_64b`; vsnp=`./autoconf_vsnprintf`; \ -- if test -f "/usr/include/stdint.h"; then have_stdint_h=1; fi; \ -+ $(HIDE)if test "$(mlib)" = "64" ; then sz64=1; else sz64=0; fi; \ - if test -f "$(prefix)/include/stdint.h"; then have_stdint_h=1; fi; \ - if test -f "$(includedir)/stdint.h"; then have_stdint_h=1; fi; \ -- sed -e "s,@HAVE_STDINT_H@,$$have_stdint_h,g" -e "s,@USE_ASSERT@,$$dbg1,g" -e "s,@USE_EOS_MARK@,$$dbg2,g" -e "s,@HAVE_64bit_SIZE_MAX@,$$sz64,g" -e "s,@HAVE_RETARDED_VSNPRINTF@,$$vsnp,g" < $< > $@ -+ sed -e "s,@HAVE_STDINT_H@,$$have_stdint_h,g" -e "s,@USE_ASSERT@,$$dbg1,g" -e "s,@USE_EOS_MARK@,$$dbg2,g" -e "s,@HAVE_64bit_SIZE_MAX@,$$sz64,g" -e "s,@HAVE_RETARDED_VSNPRINTF@,$(vsnp),g" < $< > $@ - - - # We don't use $(DEPS_NONC_ALL) as deps. because it then recompiles everything - # too much, and we care about speed more. Do make clean to "fix". - # Yes, scons fixes this. - %-code-so-opt.o: %-opt-code.c %-code.h %.h $(DEPS_C_ALL) -- $(HIDE)echo Compiling for SO OPT lib: $< - $(HIDE)$(CC) $(CFLAGS) -fPIC $(CFLG_LIB_OPT) -o $@ -c $< - - %-code-so-dbg.o: %-dbg-code.c %-code.h %.h $(DEPS_C_ALL) -- $(HIDE)echo Compiling for SO DBG lib: $< - $(HIDE)$(CC) $(DBG_CFLAGS) -fPIC $(CFLG_LIB_DBG) -o $@ -c $< - - %-code-a-opt.o: %-opt-code.c %-code.h %.h $(DEPS_C_ALL) -- $(HIDE)echo Compiling for A OPT lib: $< - $(HIDE)$(CC) $(CFLAGS) $(CFLG_LIB_OPT) -o $@ -c $< - - %-code-a-dbg.o: %-dbg-code.c %-code.h %.h $(DEPS_C_ALL) -- $(HIDE)echo Compiling for A DBG lib: $< - $(HIDE)$(CC) $(DBG_CFLAGS) $(CFLG_LIB_DBG) -o $@ -c $< - - - perf-sizes: perf-sizes.c $(OBJS_C_OPT_ALL) - $(CC) $(WARNS) -O2 -g $(LDFLAGS) -o $@ $^ diff --git a/recipes-extended/ustr/ustr_1.0.4.bb b/recipes-extended/ustr/ustr_1.0.4.bb deleted file mode 100644 index c34799b..0000000 --- a/recipes-extended/ustr/ustr_1.0.4.bb +++ /dev/null @@ -1,55 +0,0 @@ -SUMMARY = "Micro String API - for C" -DESCRIPTION = "Micro string library, very low overhead from plain strdup() (Ave. 44% for \ -0-20B strings). Very easy to use in existing C code. At it's simplest you can \ -just include a single header file into your .c and start using it." - -SECTION = "base" -PR = "r2" -LICENSE = "MIT | LGPLv2+ | BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c79c6e2ae13418d16d7dc82df960a1e7 \ - file://LICENSE_BSD;md5=ceb504b0b6471e76cc9cb32cfb150f3c \ - file://LICENSE_LGPL;md5=d8045f3b8f929c1cb29a1e3fd737b499 \ - file://LICENSE_MIT;md5=c61e779b782608472bd87593c3c3916f" - -SRC_URI = "\ - http://www.and.org/ustr/${PV}/${BPN}-${PV}.tar.bz2 \ - file://ustr-makefile-fix.patch;patch=1 \ - file://ustr-fix__va_copy-not-defined.patch;patch=2 \ - file://ustr-c99-inline.patch;patch=3 \ - file://ustr-gnu-inline.diff;patch=4 \ -" -SRC_URI[md5sum] = "93147d9f0c9765d4cd0f04f7e44bdfce" -SRC_URI[sha256sum] = "3daf6eae9f78de1e872c0b2b83cce35515b94d4bb8a074e48f331fd99e1fc2c4" - -inherit lib_package -inherit siteinfo - -LEAD_SONAME = "libustr-1.0.so.1" - -FILES_${PN}-dev += "${bindir}/ustr-import \ - ${libexecdir}/ustr-${PV}/ustr-import-* \ - ${datadir}/.gdb_init \ - ${datadir}/ustr-${PV} \ - " - -EXTRA_OEMAKE_virtclass-native = "prefix=/usr" - -do_compile() { - oe_runmake all-shared \ - mlib=${SITEINFO_BITS} -} - -do_install() { - oe_runmake install-multilib-linux \ - mlib=${SITEINFO_BITS} \ - DESTDIR=${D} LDCONFIG=/bin/true - mkdir -p ${D}/${datadir}/doc/${BPN}-${PV} - install ChangeLog ${D}/${datadir}/doc/${BPN}-${PV} - install LICENSE* ${D}/${datadir}/doc/${BPN}-${PV} - install README ${D}/${datadir}/doc/${BPN}-${PV} - install NEWS ${D}/${datadir}/doc/${BPN}-${PV} - mv ${D}/${docdir}/ustr-devel-${PV}/strdup\ vs.\ ustr.gnumeric \ - ${D}/${docdir}/ustr-devel-${PV}/strdup_vs._ustr.gnumeric -} - -BBCLASSEXTEND = "native" -- cgit v1.2.3-54-g00ecf