commit 0bb73e3665f700d24d526ef886af2a7b1c0226bc
Author: Jan Rękorajski <[email protected]>
Date: Tue Nov 25 20:51:18 2014 +0100
- fix passing CFLAGS/LDFLAGS
- rel 3
netsurf.spec | 11 +++++++++--
optflags.patch | 15 +++++++++++++++
2 files changed, 24 insertions(+), 2 deletions(-)
---
diff --git a/netsurf.spec b/netsurf.spec
index 830391c..83922a4 100644
--- a/netsurf.spec
+++ b/netsurf.spec
@@ -8,7 +8,7 @@ Summary: Light WWW browser with CSS support
Summary(pl.UTF-8): Lekka przeglądarka WWW z obsługą CSS
Name: netsurf
Version: 3.1
-Release: 2
+Release: 3
License: GPL v2 with OpenSSL exception (code), MIT (artwork)
Group: Applications/Networking
Source0:
http://download.netsurf-browser.org/netsurf/releases/source/%{name}-%{version}-src.tar.gz
@@ -17,6 +17,7 @@ Source1: %{name}.desktop
Patch0: nsfb-ldflags.patch
Patch1: %{name}-link.patch
Patch2: no-Werror.patch
+Patch3: optflags.patch
URL: http://netsurf-browser.org/
BuildRequires: curl-devel
BuildRequires: freetype-devel >= 2
@@ -129,6 +130,7 @@ Ten pakiet zawiera wersję SDL.
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
cat << EOF > Makefile.config
NETSURF_FB_FONTLIB := freetype
@@ -152,17 +154,22 @@ export CXX="%{__cxx}"
# silence -Werror:
#src/surface/vnc.c: In function 'vnc_input':
#src/surface/vnc.c:489:9: error: variable 'ret' set but not used
[-Werror=unused-but-set-variable]
-export CFLAGS="%{rpmcflags} -Wno-error=unused-but-set-variable"
+export CFLAGS="%{rpmcflags} -Wno-error=unused-but-set-variable -D_GNU_SOURCE"
+export CXXFLAGS="%{rpmcxxflags} -Wno-error=unused-but-set-variable
-D_GNU_SOURCE"
export LDFLAGS="%{rpmldflags}"
# make -j1 or it won't find libwapcaplet/libwapcaplet.h
%{__make} -j1 \
+ OPTFLAGS="%{rpmcflags} -Wno-error=unused-but-set-variable
-D_GNU_SOURCE" \
+ OPTLDFLAGS="%{rpmldflags}" \
PREFIX=%{_prefix} \
Q='' \
TARGET=gtk
%{__make} -j1 \
+ OPTFLAGS="%{rpmcflags} -Wno-error=unused-but-set-variable
-D_GNU_SOURCE" \
+ OPTLDFLAGS="%{rpmldflags}" \
PREFIX=%{_prefix} \
Q='' \
TARGET=framebuffer
diff --git a/optflags.patch b/optflags.patch
new file mode 100644
index 0000000..450d3a9
--- /dev/null
+++ b/optflags.patch
@@ -0,0 +1,15 @@
+--- netsurf-3.1/Makefile.orig 2014-04-25 13:14:16.000000000 +0200
++++ netsurf-3.1/Makefile 2014-11-25 20:46:18.669202155 +0100
+@@ -437,10 +437,10 @@
+ $(eval $(call feature_enabled,LIBICONV_PLUG,-DLIBICONV_PLUG,,glibc internal
iconv))
+
+ # common libraries without pkg-config support
+-LDFLAGS += -lz
++LDFLAGS += -lz $(OPTLDFLAGS)
+
+ # add top level and build directory to include search path
+-CFLAGS += -I. -I$(OBJROOT)
++CFLAGS += -I. -I$(OBJROOT) $(OPTFLAGS)
+
+ # export the user agent format
+ CFLAGS += -DNETSURF_UA_FORMAT_STRING=\"$(NETSURF_UA_FORMAT_STRING)\"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/netsurf.git/commitdiff/0bb73e3665f700d24d526ef886af2a7b1c0226bc
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
