diff options
| author |   Sebastian Pipping <sping@gentoo.org> | 2015-08-10 18:25:30 +0200 |
|---|---|---|
| committer | Sebastian Pipping <sping@gentoo.org> | 2015-08-10 19:06:19 +0200 |
| commit | bd4460074770ea6d83a310a2ebc4cb98540f3070 (patch) | |
| tree | 17a4c7aec74acf1cac75fc4b091741e9a33e8a0f /dev-libs/iniparser/files | |
| parent | Limit dev-libs/iniparser reverse dendencies to slot 0 (not slot 4) (diff) | |
| download | gentoo-bd4460074770ea6d83a310a2ebc4cb98540f3070.tar.gz gentoo-bd4460074770ea6d83a310a2ebc4cb98540f3070.tar.bz2 gentoo-bd4460074770ea6d83a310a2ebc4cb98540f3070.zip | |
dev-libs/iniparser: 4.0 (bug #408558)
Package-Manager: portage-2.2.20
Diffstat (limited to 'dev-libs/iniparser/files')
| -rw-r--r-- | dev-libs/iniparser/files/iniparser-4.0-cflags.patch | 28 | ||||
| -rw-r--r-- | dev-libs/iniparser/files/iniparser-4.0-soname.patch | 35 |
2 files changed, 63 insertions, 0 deletions
diff --git a/dev-libs/iniparser/files/iniparser-4.0-cflags.patch b/dev-libs/iniparser/files/iniparser-4.0-cflags.patch new file mode 100644 index 000000000000..817b087e6d20 --- /dev/null +++ b/dev-libs/iniparser/files/iniparser-4.0-cflags.patch @@ -0,0 +1,28 @@ +From 14370f5ce94cce077c798db6611ef65cd1822df2 Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping <sebastian@pipping.org> +Date: Sat, 8 Aug 2015 19:04:08 +0200 +Subject: [PATCH 1/2] Respect user CFLAGS + +--- + Makefile | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/Makefile b/Makefile +index 78708a5..744405a 100644 +--- a/Makefile ++++ b/Makefile +@@ -6,11 +6,6 @@ + CC ?= gcc + + CFLAGS += -fPIC -Wall -Wextra -ansi -pedantic +-ifndef DEBUG +-CFLAGS += -O2 +-else +-CFLAGS += -g +-endif + + # Ar settings to build the library + AR ?= ar +-- +2.5.0 + diff --git a/dev-libs/iniparser/files/iniparser-4.0-soname.patch b/dev-libs/iniparser/files/iniparser-4.0-soname.patch new file mode 100644 index 000000000000..0536b671a5c3 --- /dev/null +++ b/dev-libs/iniparser/files/iniparser-4.0-soname.patch @@ -0,0 +1,35 @@ +From c3a112a89d3cbbfe0edc4fbac366a47986d6c118 Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping <sebastian@pipping.org> +Date: Sat, 8 Aug 2015 19:10:27 +0200 +Subject: [PATCH 2/2] Adjust soname and make target non-phony + +--- + Makefile | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 744405a..323e579 100644 +--- a/Makefile ++++ b/Makefile +@@ -14,6 +14,7 @@ ARFLAGS = rcv + SHLD = ${CC} ${CFLAGS} + LDSHFLAGS = -shared -Wl,-Bsymbolic + LDFLAGS += -Wl,-rpath -Wl,/usr/lib -Wl,-rpath,/usr/lib ++SONAME_CURRENT = 1 + + # Set RANLIB to ranlib on systems that require it (Sun OS < 4, Mac OSX) + # RANLIB = ranlib +@@ -52,8 +53,8 @@ libiniparser.a: $(OBJS) + $(QUIET_RANLIB)$(RANLIB) $@ + + libiniparser.so: $(OBJS) +- $(QUIET_LINK)$(SHLD) $(LDSHFLAGS) $(LDFLAGS) -o $@.0 $(OBJS) \ +- -Wl,-soname=`basename $@`.0 ++ $(QUIET_LINK)$(SHLD) $(LDSHFLAGS) $(LDFLAGS) -o $@ $(OBJS) \ ++ -Wl,-soname=libiniparser4.so.$(SONAME_CURRENT) + + clean: + $(RM) $(OBJS) +-- +2.5.0 + |