Accepting request 372966 from home:fbui:branches:Base:System:cleanup-package-deps
OBS-URL: https://build.opensuse.org/request/show/372966 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=933
This commit is contained in:
Franck Bui
Git OBS Bridge
parent
923f9ed571
commit
023ef9eec7
@ -1,3 +1,25 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 14 18:04:10 UTC 2016 - fbui@suse.com
|
||||
|
||||
- drop all compiler/linker option customizations:
|
||||
- -pipe option is used by default since day 0
|
||||
- get rid of cflags() function which is not needed
|
||||
- --hash-size has no impact specially in runtime
|
||||
|
||||
IOW, use the default options for the compiler and the linker,
|
||||
there's no point in making systemd different from other package in
|
||||
this regards.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 14 17:26:00 UTC 2016 - fbui@suse.com
|
||||
|
||||
- use %make_build instead of 'make %{?_smp_mflags}'
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 14 16:36:32 UTC 2016 - fbui@suse.com
|
||||
|
||||
- be more strict on own lib version requirements
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 14 16:11:49 UTC 2016 - fbui@suse.com
|
||||
|
||||
|
||||
@ -329,7 +329,7 @@ Some systemd commands offer bash completion, but it's an optional dependency.
|
||||
Summary: Development headers for systemd
|
||||
License: LGPL-2.1+
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libsystemd0%{?mini} = %version
|
||||
Requires: libsystemd0%{?mini} = %{version}-%{release}
|
||||
Requires: systemd-rpm-macros
|
||||
%if 0%{?bootstrap}
|
||||
Provides: systemd-devel = %version-%release
|
||||
@ -343,7 +343,7 @@ Development headers and auxiliary files for developing applications for systemd.
|
||||
Summary: System V init tools
|
||||
License: LGPL-2.1+
|
||||
Group: System/Base
|
||||
Requires: %{name} = %{version}
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Provides: sbin_init
|
||||
Conflicts: otherproviders(sbin_init)
|
||||
Provides: sysvinit:/sbin/init
|
||||
@ -629,38 +629,6 @@ sed -ri 's:#TTYPath=/dev/console:#TTYPath=/dev/tty10:' src/journal/journald.conf
|
||||
%endif
|
||||
|
||||
%build
|
||||
cflags ()
|
||||
{
|
||||
local flag=$1; shift
|
||||
local var=$1; shift
|
||||
local gold
|
||||
test -n "${flag}" -a -n "${var}" || return
|
||||
case "${!var}" in
|
||||
*${flag}*) return
|
||||
esac
|
||||
if type ld.gold > /dev/null 2>&1 ; then
|
||||
gold=-Wl,-fuse-ld=gold
|
||||
fi
|
||||
set -o noclobber
|
||||
case "$flag" in
|
||||
-Wl,*)
|
||||
if echo 'int main () { return 0; }' | \
|
||||
${CC:-gcc} -Werror $gold $flag -o /dev/null -xc - > /dev/null 2>&1 ; then
|
||||
eval $var=\${$var:+\$$var\ }$flag
|
||||
fi
|
||||
rm -f ldtest.c
|
||||
;;
|
||||
*)
|
||||
if ${CC:-gcc} -Werror $gold $flag -S -o /dev/null -xc /dev/null > /dev/null 2>&1 ; then
|
||||
eval $var=\${$var:+\$$var\ }$flag
|
||||
fi
|
||||
if ${CXX:-g++} -Werror $gold $flag -S -o /dev/null -xc++ /dev/null > /dev/null 2>&1 ; then
|
||||
eval $var=\${$var:+\$$var\ }$flag
|
||||
fi
|
||||
esac
|
||||
set +o noclobber
|
||||
}
|
||||
|
||||
#
|
||||
# Be sure that fresh build libudev is linked as otherwise no errors are found
|
||||
#
|
||||
@ -672,17 +640,13 @@ systemd_cryptsetup_LDFLAGS = \\\
|
||||
}' Makefile.am
|
||||
sh autogen.sh
|
||||
|
||||
export V=e
|
||||
export CFLAGS="%{optflags}"
|
||||
export LDFLAGS
|
||||
%if 0%{?suse_version} == 1315
|
||||
CFLAGS="$CFLAGS -DNET_IFNAMES=1"
|
||||
%else
|
||||
CFLAGS="$CFLAGS -DNET_IFNAMES=0"
|
||||
%endif
|
||||
cflags -pipe CFLAGS
|
||||
cflags -Wl,-O2 LDFLAGS
|
||||
cflags -Wl,--hash-size=8599 LDFLAGS
|
||||
|
||||
# certificate-root is set to /etc/pki/systemd instead of the
|
||||
# built-in default /etc/ssl as journal-remote and journal-upload
|
||||
# think they kan put stuff in /etc/ssl/certs then but that
|
||||
@ -730,9 +694,10 @@ cflags -Wl,--hash-size=8599 LDFLAGS
|
||||
--disable-resolved \
|
||||
%endif
|
||||
--disable-kdbus
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%make_build V=e
|
||||
%if ! 0%{?bootstrap}
|
||||
make %{?_smp_mflags} update-man-list man
|
||||
%make_build V=e update-man-list man
|
||||
%endif
|
||||
|
||||
%install
|
||||
|
||||
@ -1,3 +1,25 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 14 18:04:10 UTC 2016 - fbui@suse.com
|
||||
|
||||
- drop all compiler/linker option customizations:
|
||||
- -pipe option is used by default since day 0
|
||||
- get rid of cflags() function which is not needed
|
||||
- --hash-size has no impact specially in runtime
|
||||
|
||||
IOW, use the default options for the compiler and the linker,
|
||||
there's no point in making systemd different from other package in
|
||||
this regards.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 14 17:26:00 UTC 2016 - fbui@suse.com
|
||||
|
||||
- use %make_build instead of 'make %{?_smp_mflags}'
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 14 16:36:32 UTC 2016 - fbui@suse.com
|
||||
|
||||
- be more strict on own lib version requirements
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 14 16:11:49 UTC 2016 - fbui@suse.com
|
||||
|
||||
|
||||
47
systemd.spec
47
systemd.spec
@ -324,7 +324,7 @@ Some systemd commands offer bash completion, but it's an optional dependency.
|
||||
Summary: Development headers for systemd
|
||||
License: LGPL-2.1+
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libsystemd0%{?mini} = %version
|
||||
Requires: libsystemd0%{?mini} = %{version}-%{release}
|
||||
Requires: systemd-rpm-macros
|
||||
%if 0%{?bootstrap}
|
||||
Provides: systemd-devel = %version-%release
|
||||
@ -338,7 +338,7 @@ Development headers and auxiliary files for developing applications for systemd.
|
||||
Summary: System V init tools
|
||||
License: LGPL-2.1+
|
||||
Group: System/Base
|
||||
Requires: %{name} = %{version}
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Provides: sbin_init
|
||||
Conflicts: otherproviders(sbin_init)
|
||||
Provides: sysvinit:/sbin/init
|
||||
@ -624,38 +624,6 @@ sed -ri 's:#TTYPath=/dev/console:#TTYPath=/dev/tty10:' src/journal/journald.conf
|
||||
%endif
|
||||
|
||||
%build
|
||||
cflags ()
|
||||
{
|
||||
local flag=$1; shift
|
||||
local var=$1; shift
|
||||
local gold
|
||||
test -n "${flag}" -a -n "${var}" || return
|
||||
case "${!var}" in
|
||||
*${flag}*) return
|
||||
esac
|
||||
if type ld.gold > /dev/null 2>&1 ; then
|
||||
gold=-Wl,-fuse-ld=gold
|
||||
fi
|
||||
set -o noclobber
|
||||
case "$flag" in
|
||||
-Wl,*)
|
||||
if echo 'int main () { return 0; }' | \
|
||||
${CC:-gcc} -Werror $gold $flag -o /dev/null -xc - > /dev/null 2>&1 ; then
|
||||
eval $var=\${$var:+\$$var\ }$flag
|
||||
fi
|
||||
rm -f ldtest.c
|
||||
;;
|
||||
*)
|
||||
if ${CC:-gcc} -Werror $gold $flag -S -o /dev/null -xc /dev/null > /dev/null 2>&1 ; then
|
||||
eval $var=\${$var:+\$$var\ }$flag
|
||||
fi
|
||||
if ${CXX:-g++} -Werror $gold $flag -S -o /dev/null -xc++ /dev/null > /dev/null 2>&1 ; then
|
||||
eval $var=\${$var:+\$$var\ }$flag
|
||||
fi
|
||||
esac
|
||||
set +o noclobber
|
||||
}
|
||||
|
||||
#
|
||||
# Be sure that fresh build libudev is linked as otherwise no errors are found
|
||||
#
|
||||
@ -667,17 +635,13 @@ systemd_cryptsetup_LDFLAGS = \\\
|
||||
}' Makefile.am
|
||||
sh autogen.sh
|
||||
|
||||
export V=e
|
||||
export CFLAGS="%{optflags}"
|
||||
export LDFLAGS
|
||||
%if 0%{?suse_version} == 1315
|
||||
CFLAGS="$CFLAGS -DNET_IFNAMES=1"
|
||||
%else
|
||||
CFLAGS="$CFLAGS -DNET_IFNAMES=0"
|
||||
%endif
|
||||
cflags -pipe CFLAGS
|
||||
cflags -Wl,-O2 LDFLAGS
|
||||
cflags -Wl,--hash-size=8599 LDFLAGS
|
||||
|
||||
# certificate-root is set to /etc/pki/systemd instead of the
|
||||
# built-in default /etc/ssl as journal-remote and journal-upload
|
||||
# think they kan put stuff in /etc/ssl/certs then but that
|
||||
@ -725,9 +689,10 @@ cflags -Wl,--hash-size=8599 LDFLAGS
|
||||
--disable-resolved \
|
||||
%endif
|
||||
--disable-kdbus
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%make_build V=e
|
||||
%if ! 0%{?bootstrap}
|
||||
make %{?_smp_mflags} update-man-list man
|
||||
%make_build V=e update-man-list man
|
||||
%endif
|
||||
|
||||
%install
|
||||
|
||||
Loading…
Reference in New Issue
Block a user