summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2021-01-19 09:36:17 +0100
committerMichał Górny <mgorny@gentoo.org>2021-01-19 09:39:07 +0100
commit16766288ecd8207d62a79d39bc66fab5333ed0b0 (patch)
tree4bc6dc7ea29d86e7e5c336dd485da8cb17e49ac4 /dev-libs/ustr/files
parentsci-mathematics/agda-lib-ffi: Remove last-rited pkg (diff)
downloadgentoo-16766288ecd8207d62a79d39bc66fab5333ed0b0.tar.gz
gentoo-16766288ecd8207d62a79d39bc66fab5333ed0b0.tar.bz2
gentoo-16766288ecd8207d62a79d39bc66fab5333ed0b0.zip
dev-libs/ustr: Remove last-rited pkg
Closes: https://bugs.gentoo.org/652192 Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'dev-libs/ustr/files')
-rw-r--r--dev-libs/ustr/files/ustr-1.0.4-build-libs.patch49
-rw-r--r--dev-libs/ustr/files/ustr-1.0.4-gcc_5-check.patch28
-rw-r--r--dev-libs/ustr/files/ustr-1.0.4-inline-check.patch27
3 files changed, 0 insertions, 104 deletions
diff --git a/dev-libs/ustr/files/ustr-1.0.4-build-libs.patch b/dev-libs/ustr/files/ustr-1.0.4-build-libs.patch
deleted file mode 100644
index 79fe818c8edf..000000000000
--- a/dev-libs/ustr/files/ustr-1.0.4-build-libs.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-make static lib build/install controllable so we can disable it by default
-
-punt the -debug lib variants ... if people want debug libs, they can rebuild
-the package using their desired build settings.
-
---- a/Makefile
-+++ b/Makefile
-@@ -291,8 +291,10 @@
- OPT_LIB_SHARED = libustr-$(VERS_BSO).so.$(VERS_ESO)
- OPT_LIB_STATIC = libustr.a
-
--LIB_SHARED = $(DBG_LIB_SHARED) $(OPT_LIB_SHARED)
--LIB_STATIC = $(DBG_LIB_STATIC) $(OPT_LIB_STATIC)
-+LIB_SHARED = $(OPT_LIB_SHARED)
-+ifeq ($(USE_STATIC),yes)
-+LIB_STATIC = $(OPT_LIB_STATIC)
-+endif
-
- DEPS_NONC_ALL = $(SRC_HDRS) $(SRC_SRCS_H)
- DEPS_C_ALL = $(SRC_HDRS)
-@@ -388,17 +390,14 @@
- install -d $(DESTDIR)$(bindir)
- install -d $(DESTDIR)$(libdir)/pkgconfig
- $(HIDE)echo Installing files
-+ifeq ($(USE_STATIC),yes)
- install -m 644 -t $(DESTDIR)$(libdir) $(LIB_STATIC)
-+endif
- install -m 755 -t $(DESTDIR)$(libdir) $(LIB_SHARED)
- -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)
-@@ -406,7 +406,7 @@ endif
- 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 -t $(DESTDIR)$(libdir)/pkgconfig ustr.pc
-
- ustr-import-multilib: ustr-import-multilib.in
- sed -e 's,@INCLUDEDIR@,$(includedir),g' -e 's,@MBINDIR@,$(MBINDIR),g' < $< > $@
diff --git a/dev-libs/ustr/files/ustr-1.0.4-gcc_5-check.patch b/dev-libs/ustr/files/ustr-1.0.4-gcc_5-check.patch
deleted file mode 100644
index aaed1503030a..000000000000
--- a/dev-libs/ustr/files/ustr-1.0.4-gcc_5-check.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/ustr-conf.h.in 2007-10-22 08:00:55.000000000 +0200
-+++ b/ustr-conf.h.in 2015-09-10 12:24:34.998796842 +0200
-@@ -4,13 +4,24 @@
- /* this is the custom version for the library itself, for everyone else
- * ustr-import generates one depending on the options. */
-
-+/* If this is GCC with major version 5 and up, the default C standard
-+ * has changed from C89 to C99 so the old inline behaviour must be
-+ * restored:
-+ */
-+#if defined(__GNUC__) \
-+ && (__GNUC__ > 4) \
-+ && defined(__STDC_VERSION__) \
-+ && (__STDC_VERSION__ >= 199901L)
-+# define inline inline __attribute__ ((gnu_inline))
-+#endif /* GCC greater than major version 4 and not -std=c89 set */
-+
- /* The default is now to link against libc. */
- #ifndef USTR_CONF_INCLUDE_CODEONLY_HEADERS
- #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 0
- #endif
-
- /* We can't: if defined(__GLIBC__) && (!defined(_GNU_SOURCE) || !_GNU_SOURCE)
-- * because by the time we've included a libc header it's too late. */
-+ * because by the time we've included a libc header it's too late. */
- #ifndef _GNU_SOURCE
- #define _GNU_SOURCE 1
- #endif
diff --git a/dev-libs/ustr/files/ustr-1.0.4-inline-check.patch b/dev-libs/ustr/files/ustr-1.0.4-inline-check.patch
deleted file mode 100644
index b38cf7829c9f..000000000000
--- a/dev-libs/ustr/files/ustr-1.0.4-inline-check.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/ustr-conf.h.in 2007-10-22 08:00:55.000000000 +0200
-+++ b/ustr-conf.h.in 2015-09-10 12:24:34.998796842 +0200
-@@ -4,13 +4,23 @@
- /* this is the custom version for the library itself, for everyone else
- * ustr-import generates one depending on the options. */
-
-+/* Ustr relies on GCC's traditional handling of inline functions, not
-+ * the version that was actually standardized in C99. GCC-compatible
-+ * compilers define __GNUC_STDC_INLINE__ when using the standard
-+ * behavior. When this is set we must restore the old inline behavior:
-+ */
-+#if defined(__GNUC__) \
-+ && defined(__GNUC_STDC_INLINE__)
-+# define inline inline __attribute__ ((gnu_inline))
-+#endif
-+
- /* The default is now to link against libc. */
- #ifndef USTR_CONF_INCLUDE_CODEONLY_HEADERS
- #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 0
- #endif
-
- /* We can't: if defined(__GLIBC__) && (!defined(_GNU_SOURCE) || !_GNU_SOURCE)
-- * because by the time we've included a libc header it's too late. */
-+ * because by the time we've included a libc header it's too late. */
- #ifndef _GNU_SOURCE
- #define _GNU_SOURCE 1
- #endif