pool/dnsmasq
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 326465 from home:StefanBruens:branches:network

Browse Source 
The build log is filled with a lot of redefinition warnings, as e.g. HAVE_DBUS is defined in both config.h and on the command line.

The correct way for the dnsmasq build system is to supply the configuration options as "COPTS" during make and make install.

OBS-URL: https://build.opensuse.org/request/show/326465
OBS-URL: https://build.opensuse.org/package/show/network/dnsmasq?expand=0&rev=77
This commit is contained in:
Dirk Mueller 2015-08-25 07:22:17 +00:00 committed by Git OBS Bridge
parent 86a5b874df
commit bcc77e54ae
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dnsmasq.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Aug 24 18:10:01 UTC 2015 - stefan.bruens@rwth-aachen.de
- spec file cleanup, get rid of redifinition warnings
-------------------------------------------------------------------
Tue Aug 11 01:41:02 UTC 2015 - stefan.bruens@rwth-aachen.de

13
dnsmasq.spec
View File

@ -88,14 +88,13 @@ sed -i -e '/trust-anchors.conf/c\#conf-file=/etc/dnsmasq.d/trust-anchors.conf' \
dnsmasq.conf.example
%build
echo "#define HAVE_DBUS" >> src/config.h
echo "#define HAVE_CONNTRACK" >> src/config.h
echo "#define HAVE_IDN" >> src/config.h
echo "#define HAVE_DNSSEC" >> src/config.h
mv po/no.po po/nb.po
export CFLAGS="%optflags -std=gnu99 -fPIC -DPIC -fpie -DHAVE_DBUS -DHAVE_CONNTRACK -DHAVE_IDN -DHAVE_DNSSEC"
export CFLAGS="%optflags -std=gnu99 -fPIC -DPIC -fpie"
export LDFLAGS="-Wl,-z,relro,-z,now -pie"
make %{?_smp_mflags} AWK=gawk all-i18n CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
# the dnsmasq make system hashes the configuration flags, so we have to supply the
# same flags for make and make install, else everything gets recompiled
%define _copts "-DHAVE_DBUS -DHAVE_CONNTRACK -DHAVE_IDN -DHAVE_DNSSEC"
make %{?_smp_mflags} AWK=gawk all-i18n CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" COPTS=%{_copts}
make -C contrib/wrt %{?_smp_mflags}
%pre
@ -122,7 +121,7 @@ fi
%service_del_postun %{name}.service
%install
make install-i18n DESTDIR=$RPM_BUILD_ROOT PREFIX=/usr AWK=gawk
make install-i18n DESTDIR=$RPM_BUILD_ROOT PREFIX=/usr AWK=gawk COPTS=%{_copts}
install -d -m 755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/slp.reg.d
install -d -m 755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
install -m 644 dnsmasq.conf.example $RPM_BUILD_ROOT/%{_sysconfdir}/dnsmasq.conf