summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /net-libs/libs3/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'net-libs/libs3/files')
-rw-r--r--net-libs/libs3/files/libs3-2.0-build.patch83
1 files changed, 83 insertions, 0 deletions
diff --git a/net-libs/libs3/files/libs3-2.0-build.patch b/net-libs/libs3/files/libs3-2.0-build.patch
new file mode 100644
index 000000000000..804a0d28332a
--- /dev/null
+++ b/net-libs/libs3/files/libs3-2.0-build.patch
@@ -0,0 +1,83 @@
+ GNUmakefile | 23 ++++++++++++-----------
+ 1 file changed, 12 insertions(+), 11 deletions(-)
+
+diff --git a/GNUmakefile b/GNUmakefile
+index 36398c1..dc24843 100644
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -60,7 +60,7 @@ LIBS3_VER := $(LIBS3_VER_MAJOR).$(LIBS3_VER_MINOR)
+ # any value, then verbosity is turned on". So don't define VERBOSE if you
+ # don't want verbosity in the build process.
+ # -----------------------------------------------------------------------------
+-
++VERBOSE = true
+ ifdef VERBOSE
+ VERBOSE = true
+ VERBOSE_ECHO = @ echo
+@@ -125,7 +125,7 @@ ifndef CFLAGS
+ endif
+ endif
+
+-CFLAGS += -Wall -Werror -Wshadow -Wextra -Iinc \
++CFLAGS += -Wall -Wshadow -Wextra -Iinc \
+ $(CURL_CFLAGS) $(LIBXML2_CFLAGS) \
+ -DLIBS3_VER_MAJOR=\"$(LIBS3_VER_MAJOR)\" \
+ -DLIBS3_VER_MINOR=\"$(LIBS3_VER_MINOR)\" \
+@@ -134,7 +134,8 @@ CFLAGS += -Wall -Werror -Wshadow -Wextra -Iinc \
+ -D_ISOC99_SOURCE \
+ -D_POSIX_C_SOURCE=200112L
+
+-LDFLAGS = $(CURL_LIBS) $(LIBXML2_LIBS) -lpthread
++LDFLAGS += -lpthread
++LIBS = $(CURL_LIBS) $(LIBXML2_LIBS)
+
+
+ # --------------------------------------------------------------------------
+@@ -157,11 +158,11 @@ exported: libs3 s3 headers
+ .PHONY: install
+ install: exported
+ $(QUIET_ECHO) $(DESTDIR)/bin/s3: Installing executable
+- $(VERBOSE_SHOW) install -Dps -m u+rwx,go+rx $(BUILD)/bin/s3 \
++ $(VERBOSE_SHOW) install -Dp -m u+rwx,go+rx $(BUILD)/bin/s3 \
+ $(DESTDIR)/bin/s3
+ $(QUIET_ECHO) \
+ $(DESTDIR)/lib/libs3.so.$(LIBS3_VER): Installing shared library
+- $(VERBOSE_SHOW) install -Dps -m u+rw,go+r \
++ $(VERBOSE_SHOW) install -Dp -m u+rw,go+r \
+ $(BUILD)/lib/libs3.so.$(LIBS3_VER_MAJOR) \
+ $(DESTDIR)/lib/libs3.so.$(LIBS3_VER)
+ $(QUIET_ECHO) \
+@@ -199,18 +200,18 @@ uninstall:
+ $(BUILD)/obj/%.o: src/%.c
+ $(QUIET_ECHO) $@: Compiling object
+ @ mkdir -p $(dir $(BUILD)/dep/$<)
+- @ gcc $(CFLAGS) -M -MG -MQ $@ -DCOMPILINGDEPENDENCIES \
++ $(CC) $(CFLAGS) -M -MG -MQ $@ -DCOMPILINGDEPENDENCIES \
+ -o $(BUILD)/dep/$(<:%.c=%.d) -c $<
+ @ mkdir -p $(dir $@)
+- $(VERBOSE_SHOW) gcc $(CFLAGS) -o $@ -c $<
++ $(VERBOSE_SHOW) $(CC) $(CFLAGS) -o $@ -c $<
+
+ $(BUILD)/obj/%.do: src/%.c
+ $(QUIET_ECHO) $@: Compiling dynamic object
+ @ mkdir -p $(dir $(BUILD)/dep/$<)
+- @ gcc $(CFLAGS) -M -MG -MQ $@ -DCOMPILINGDEPENDENCIES \
++ $(CC) $(CFLAGS) -M -MG -MQ $@ -DCOMPILINGDEPENDENCIES \
+ -o $(BUILD)/dep/$(<:%.c=%.dd) -c $<
+ @ mkdir -p $(dir $@)
+- $(VERBOSE_SHOW) gcc $(CFLAGS) -fpic -fPIC -o $@ -c $<
++ $(VERBOSE_SHOW) $(CC) $(CFLAGS) -fpic -fPIC -o $@ -c $<
+
+
+ # --------------------------------------------------------------------------
+@@ -230,8 +231,8 @@ LIBS3_SOURCES := acl.c bucket.c error_parser.c general.c \
+ $(LIBS3_SHARED): $(LIBS3_SOURCES:%.c=$(BUILD)/obj/%.do)
+ $(QUIET_ECHO) $@: Building shared library
+ @ mkdir -p $(dir $@)
+- $(VERBOSE_SHOW) gcc -shared -Wl,-soname,libs3.so.$(LIBS3_VER_MAJOR) \
+- -o $@ $^ $(LDFLAGS)
++ $(VERBOSE_SHOW) $(CC) $(LDFLAGS) -shared -Wl,-soname,libs3.so.$(LIBS3_VER_MAJOR) \
++ -o $@ $^ $(LIBS)
+
+ $(LIBS3_STATIC): $(LIBS3_SOURCES:%.c=$(BUILD)/obj/%.o)
+ $(QUIET_ECHO) $@: Building static library