commit e3493c1529e3b51045492f7e50df3aa9411b7706
Author: Jakub Bogusz <[email protected]>
Date: Sat May 14 08:16:09 2016 +0200
- added make patch, pass our CPPFLAGS and LDFLAGS (incl. as-needed to avoid
propagating dozens of curl deps)
- release 4
libs3-make.patch | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
libs3.spec | 13 +++++++++---
2 files changed, 71 insertions(+), 3 deletions(-)
---
diff --git a/libs3.spec b/libs3.spec
index 327c36a..f3415b2 100644
--- a/libs3.spec
+++ b/libs3.spec
@@ -6,11 +6,12 @@ Summary: C library and tools for Amazon S3 access
Summary(pl.UTF-8): Biblioteka C i narzędzia do dostępu do Amazon S3
Name: libs3
Version: 2.0
-Release: 3
+Release: 4
License: GPL v3 with OpenSSL exception
Group: Libraries
Source0:
http://libs3.ischo.com.s3.amazonaws.com/%{name}-%{version}.tar.gz
# Source0-md5: e52da69ddc11019e98cf8246fc55b4e1
+Patch0: %{name}-make.patch
URL: https://github.com/bji/libs3
BuildRequires: curl-devel
%{?with_apidocs:BuildRequires: doxygen}
@@ -71,10 +72,13 @@ Dokumentacja API biblioteki libs3.
%prep
%setup -q
+%patch0 -p1
%build
-CFLAGS="%{rpmcflags}" \
+CFLAGS="%{rpmcflags} %{rpmcppflags}" \
%{__make} exported \
+ CC="%{__cc}" \
+ LDOPTS="%{rpmldflags}" \
VERBOSE=1
%{?with_apidocs:doxygen}
@@ -86,9 +90,12 @@ rm -rf $RPM_BUILD_ROOT
DESTDIR=$RPM_BUILD_ROOT%{_prefix}
%if "%{_lib}" != "lib"
-mv -f $RPM_BUILD_ROOT%{_prefix}/{lib,%{_lib}}
+%{__mv} $RPM_BUILD_ROOT%{_prefix}/{lib,%{_lib}}
%endif
+# let rpm generate dependencies
+chmod 755 $RPM_BUILD_ROOT%{_libdir}/libs3.so*
+
%clean
rm -rf $RPM_BUILD_ROOT
diff --git a/libs3-make.patch b/libs3-make.patch
new file mode 100644
index 0000000..fff68fa
--- /dev/null
+++ b/libs3-make.patch
@@ -0,0 +1,61 @@
+--- libs3-2.0/GNUmakefile.orig 2011-09-28 10:16:09.000000000 +0200
++++ libs3-2.0/GNUmakefile 2016-05-14 08:09:16.677994347 +0200
+@@ -134,7 +134,7 @@
+ -D_ISOC99_SOURCE \
+ -D_POSIX_C_SOURCE=200112L
+
+-LDFLAGS = $(CURL_LIBS) $(LIBXML2_LIBS) -lpthread
++LDFLAGS = $(LDOPTS) $(CURL_LIBS) $(LIBXML2_LIBS) -lpthread
+
+
+ # --------------------------------------------------------------------------
+@@ -199,18 +199,18 @@
+ $(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,7 +230,7 @@
+ $(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) \
++ $(VERBOSE_SHOW) $(CC) -shared -Wl,-soname,libs3.so.$(LIBS3_VER_MAJOR) \
+ -o $@ $^ $(LDFLAGS)
+
+ $(LIBS3_STATIC): $(LIBS3_SOURCES:%.c=$(BUILD)/obj/%.o)
+@@ -248,7 +248,7 @@
+ $(BUILD)/bin/s3: $(BUILD)/obj/s3.o $(LIBS3_SHARED)
+ $(QUIET_ECHO) $@: Building executable
+ @ mkdir -p $(dir $@)
+- $(VERBOSE_SHOW) gcc -o $@ $^ $(LDFLAGS)
++ $(VERBOSE_SHOW) $(CC) -o $@ $^ $(LDFLAGS)
+
+
+ # --------------------------------------------------------------------------
+@@ -272,7 +272,7 @@
+ $(BUILD)/bin/testsimplexml: $(BUILD)/obj/testsimplexml.o $(LIBS3_STATIC)
+ $(QUIET_ECHO) $@: Building executable
+ @ mkdir -p $(dir $@)
+- $(VERBOSE_SHOW) gcc -o $@ $^ $(LIBXML2_LIBS)
++ $(VERBOSE_SHOW) $(CC) -o $@ $^ $(LIBXML2_LIBS)
+
+
+ # --------------------------------------------------------------------------
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libs3.git/commitdiff/e3493c1529e3b51045492f7e50df3aa9411b7706
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
