Update to last sucessful build

755a6ac1305db623215078f23a637ead8c89799f Add CMake option to disable libproxy usage and disable it on SLE. (bnc#752500)

OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=871
This commit is contained in:
ZYpp Developers 2012-03-19 12:15:06 +00:00 committed by Git OBS Bridge
parent ee91bd18ce
commit 1463309a07
2 changed files with 5 additions and 2 deletions

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d6c2df04deb946eae6a909ad47a48b3a41f18f4f739415f0f5272b90b52beae1
size 4952500
oid sha256:3b536e5843c2ab5ef98e6a04c8653a14241733e7a7a861ee20f93d7a4f02bddb
size 4953642

View File

@ -202,10 +202,12 @@ cd build
export CFLAGS="$RPM_OPT_FLAGS"
export CXXFLAGS="$RPM_OPT_FLAGS"
unset TRANSLATION_SET
unset EXTRA_CMAKE_OPTIONS
# SLE11-* might want its own translation set:
%if 0%{?suse_version} == 1110
if [ -f ../po/sle-zypp-po.tar.bz ]; then
export TRANSLATION_SET=sle-zypp
export EXTRA_CMAKE_OPTIONS="-DDISABLE_LIBPROXY=ON"
fi
%endif
cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
@ -214,6 +216,7 @@ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_SKIP_RPATH=1 \
-DUSE_TRANSLATION_SET=${TRANSLATION_SET:-zypp} \
${EXTRA_CMAKE_OPTIONS} \
..
make %{?_smp_mflags} VERBOSE=1
make -C doc/autodoc %{?_smp_mflags}