Hello community, here is the log from the commit of package vpp for openSUSE:Factory checked in at 2018-10-04 19:01:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vpp (Old) and /work/SRC/openSUSE:Factory/.vpp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vpp" Thu Oct 4 19:01:39 2018 rev:18 rq:639754 version:18.07.1 Changes: -------- --- /work/SRC/openSUSE:Factory/vpp/vpp.changes 2018-09-24 13:13:09.929716913 +0200 +++ /work/SRC/openSUSE:Factory/.vpp.new/vpp.changes 2018-10-04 19:01:40.335192161 +0200 @@ -1,0 +2,14 @@ +Tue Oct 2 17:33:02 UTC 2018 - Jan Engelhardt <[email protected]> + +- Really fix boo#1110294 by correcting broken build + descriptions with regard to library dependencies. + Adds deps.patch. Removes reproducible_build.patch. +- Parallelize build according to rpmbuild flags. + +------------------------------------------------------------------- +Mon Oct 1 15:29:37 UTC 2018 - Marco Varlese <[email protected]> + +- Added reproducible_build.patch to fix boo#1110294: + Wrong dependencies caused build to fail with 'make' option '-j1' + +------------------------------------------------------------------- New: ---- deps.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vpp.spec ++++++ --- /var/tmp/diff_new_pack.hhc4md/_old 2018-10-04 19:01:40.955191509 +0200 +++ /var/tmp/diff_new_pack.hhc4md/_new 2018-10-04 19:01:40.955191509 +0200 @@ -32,6 +32,7 @@ Source0: %{name}-%{version}-release.tar.xz Patch0: enable-shared-dpdk.patch Patch1: startup-conf.patch +Patch2: deps.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bison @@ -158,12 +159,13 @@ %setup -q -n %{name}-%{version} %patch0 -p1 %patch1 +%patch2 -p1 %build export VPP_BUILD_USER=suse export VPP_BUILD_HOST=SUSE -make -C build-root CC=gcc-7 CXX=g++-7 PLATFORM=vpp TAG=vpp install-packages +make -C build-root CC=gcc-7 CXX=g++-7 PLATFORM=vpp TAG=vpp MAKE_PARALLEL_JOBS="%{?_smp_mflags}" install-packages cd %{_vpp_build_dir}/../src/vpp-api/python && %{py2_build} ++++++ deps.patch ++++++ Everything in LIBADD that is a file target becomes a dependency automatically. Stop overriding these auto-discovered dependencies. If (and only if) there is something special like a map file, that must go into EXTRA(!)_xx_DEPENDENCIES. --- extras/vom/vom/Makefile.am | 1 - src/svm.am | 2 -- src/vcl.am | 8 +++----- src/vlib-api.am | 6 ++---- src/vlib.am | 1 - src/vnet.am | 8 ++++---- src/vpp-api-test.am | 1 - src/vpp-api.am | 5 +---- src/vpp-api/java/Makefile.am | 9 --------- src/vpp-api/vapi/Makefile.am | 2 +- 10 files changed, 11 insertions(+), 32 deletions(-) Index: vpp-18.07.1/extras/vom/vom/Makefile.am =================================================================== --- vpp-18.07.1.orig/extras/vom/vom/Makefile.am +++ vpp-18.07.1/extras/vom/vom/Makefile.am @@ -23,7 +23,6 @@ CLEANDIRS = lib_LTLIBRARIES = libvom.la -libvom_la_DEPENDENCIES = libvom_la_LIBADD = \ -lvapiclient \ -lpthread \ Index: vpp-18.07.1/src/svm.am =================================================================== --- vpp-18.07.1.orig/src/svm.am +++ vpp-18.07.1/src/svm.am @@ -34,13 +34,11 @@ libsvm_la_SOURCES = \ svm/message_queue.c libsvm_la_LIBADD = libvppinfra.la -lrt -lpthread -libsvm_la_DEPENDENCIES = libvppinfra.la svmtool_SOURCES = svm/svmtool.c svmtool_LDADD = libsvm.la libvppinfra.la -lpthread -lrt libsvmdb_la_LIBADD = libvppinfra.la libsvm.la -libsvmdb_la_DEPENDENCIES = libvppinfra.la libsvm.la libsvmdb_la_SOURCES = svm/svmdb.c svmdbtool_SOURCES = svm/svmdbtool.c Index: vpp-18.07.1/src/vcl.am =================================================================== --- vpp-18.07.1.orig/src/vcl.am +++ vpp-18.07.1/src/vcl.am @@ -15,11 +15,9 @@ lib_LTLIBRARIES += libvppcom.la libvcl_l libvppcom_la_SOURCES = libvcl_ldpreload_la_SOURCES = -libvppcom_la_DEPENDENCIES = \ +libvppcom_la_LIBADD = \ libsvm.la \ - libvlibmemoryclient.la - -libvppcom_la_LIBADD = $(libvppcom_la_DEPENDENCIES) -lpthread -lrt -ldl + libvlibmemoryclient.la -lpthread -lrt -ldl libvppcom_la_SOURCES += \ vcl/vppcom.c \ @@ -36,7 +34,7 @@ nobase_include_HEADERS += \ vcl/vcl_event.h \ vcl/vppcom.h -libvcl_ldpreload_la_LIBADD = $(libvppcom_la_DEPENDENCIES) -lpthread -lrt -ldl +libvcl_ldpreload_la_LIBADD = $(libvppcom_la_LIBADD) libvcl_ldpreload_la_SOURCES += \ vcl/ldp_socket_wrapper.c \ Index: vpp-18.07.1/src/vlib-api.am =================================================================== --- vpp-18.07.1.orig/src/vlib-api.am +++ vpp-18.07.1/src/vlib-api.am @@ -13,8 +13,7 @@ lib_LTLIBRARIES += libvlibmemory.la libvlibmemoryclient.la -libvlibmemory_la_DEPENDENCIES = libvppinfra.la libsvm.la libvlib.la -libvlibmemory_la_LIBADD = $(libvlibmemory_la_DEPENDENCIES) -lpthread +libvlibmemory_la_LIBADD = libvppinfra.la libsvm.la libvlib.la -lpthread libvlibmemory_la_SOURCES = \ vlibapi/api.h \ vlibapi/api_helper_macros.h \ @@ -36,8 +35,7 @@ nobase_include_HEADERS += \ vlibapi/api_helper_macros.h \ vlibapi/vat_helper_macros.h -libvlibmemoryclient_la_DEPENDENCIES = libvppinfra.la libsvm.la -libvlibmemoryclient_la_LIBADD = $(libvlibmemoryclient_la_DEPENDENCIES) -lpthread +libvlibmemoryclient_la_LIBADD = libvppinfra.la libsvm.la -lpthread libvlibmemoryclient_la_SOURCES = \ vlibapi/api_helper_macros.h \ vlibapi/api_shared.c \ Index: vpp-18.07.1/src/vlib.am =================================================================== --- vpp-18.07.1.orig/src/vlib.am +++ vpp-18.07.1/src/vlib.am @@ -14,7 +14,6 @@ lib_LTLIBRARIES += libvlib.la libvlib_la_LIBADD = libvppinfra.la -ldl -lpthread -libvlib_la_DEPENDENCIES = libvppinfra.la libvlib_la_SOURCES = \ vlib/buffer.c \ Index: vpp-18.07.1/src/vnet.am =================================================================== --- vpp-18.07.1.orig/src/vnet.am +++ vpp-18.07.1/src/vnet.am @@ -15,15 +15,15 @@ lib_LTLIBRARIES += libvnet.la noinst_LTLIBRARIES = libvnet_la_SOURCES = -libvnet_la_DEPENDENCIES = \ +libvnet_la_LIBADD = \ libvppinfra.la \ libvlib.la \ libsvmdb.la \ libsvm.la \ - libvlibmemory.la -libvnet_multiversioning_sources = + libvlibmemory.la \ + -lm -lpthread -ldl -lrt -libvnet_la_LIBADD = $(libvnet_la_DEPENDENCIES) -lm -lpthread -ldl -lrt +libvnet_multiversioning_sources = if WITH_LIBSSL libvnet_la_LIBADD += -lcrypto Index: vpp-18.07.1/src/vpp-api-test.am =================================================================== --- vpp-18.07.1.orig/src/vpp-api-test.am +++ vpp-18.07.1/src/vpp-api-test.am @@ -12,7 +12,6 @@ # limitations under the License. libvatplugin_la_LIBADD = libvppinfra.la -libvatplugin_la_DEPENDENCIES = libvppinfra.la libvatplugin_la_SOURCES = \ vat/plugin_api.c Index: vpp-18.07.1/src/vpp-api.am =================================================================== --- vpp-18.07.1.orig/src/vpp-api.am +++ vpp-18.07.1/src/vpp-api.am @@ -19,14 +19,11 @@ libvppapiclient_la_SOURCES = \ vpp-api/client/client.c \ vpp-api/client/libvppapiclient.map -libvppapiclient_la_LIBADD = \ - -lpthread -lm -lrt - libvppapiclient_la_LDFLAGS = \ -Wl,-L$(top_builddir)/.libs,--whole-archive,-l:libsvm.a,-l:libvppinfra.a,-l:libvlibmemoryclient.a,--no-whole-archive \ -Wl,--version-script=$(srcdir)/vpp-api/client/libvppapiclient.map,-lrt -libvppapiclient_la_DEPENDENCIES = libvppinfra.la libvlibmemoryclient.la libsvm.la +libvppapiclient_la_LIBADD = libvppinfra.la libvlibmemoryclient.la libsvm.la -lpthread -lm -lrt libvppapiclient_la_CPPFLAGS = Index: vpp-18.07.1/src/vpp-api/java/Makefile.am =================================================================== --- vpp-18.07.1.orig/src/vpp-api/java/Makefile.am +++ vpp-18.07.1/src/vpp-api/java/Makefile.am @@ -54,7 +54,6 @@ noinst_LTLIBRARIES += libjvpp_registry.l libjvpp_registry_la_SOURCES = jvpp-registry/jvpp_registry.c libjvpp_registry_la_CPPFLAGS = -Ijvpp-registry libjvpp_registry_la_LIBADD = $(JVPP_LIBS) -libjvpp_registry_la_DEPENDENCIES = libjvpp_common.la packagedir_jvpp_registry = io/fd/vpp/jvpp jvpp_registry_src_files := \ @@ -92,7 +91,6 @@ noinst_LTLIBRARIES += libjvpp_core.la libjvpp_core_la_SOURCES = jvpp-core/jvpp_core.c jvpp-core/jvpp_core_gen.h libjvpp_core_la_CPPFLAGS = -Ijvpp-registry -Ijvpp-core libjvpp_core_la_LIBADD = $(JVPP_LIBS) -libjvpp_core_la_DEPENDENCIES = libjvpp_common.la BUILT_SOURCES += jvpp-core/io_fd_vpp_jvpp_core_JVppCoreImpl.h JAR_FILES += jvpp-core-$(PACKAGE_VERSION).jar @@ -115,7 +113,6 @@ noinst_LTLIBRARIES += libjvpp_acl.la libjvpp_acl_la_SOURCES = jvpp-acl/jvpp_acl.c libjvpp_acl_la_CPPFLAGS = -Ijvpp-acl libjvpp_acl_la_LIBADD = $(JVPP_LIBS) -libjvpp_acl_la_DEPENDENCIES = libjvpp_common.la BUILT_SOURCES += jvpp-acl/io_fd_vpp_jvpp_acl_JVppAclImpl.h JAR_FILES += jvpp-acl-$(PACKAGE_VERSION).jar @@ -135,7 +132,6 @@ noinst_LTLIBRARIES += libjvpp_gtpu.la libjvpp_gtpu_la_SOURCES = jvpp-gtpu/jvpp_gtpu.c libjvpp_gtpu_la_CPPFLAGS = -Ijvpp-gtpu libjvpp_gtpu_la_LIBADD = $(JVPP_LIBS) -libjvpp_gtpu_la_DEPENDENCIES = libjvpp_common.la BUILT_SOURCES += jvpp-gtpu/io_fd_vpp_jvpp_gtpu_JVppGtpuImpl.h JAR_FILES += jvpp-gtpu-$(PACKAGE_VERSION).jar @@ -155,7 +151,6 @@ noinst_LTLIBRARIES += libjvpp_pppoe.la libjvpp_pppoe_la_SOURCES = jvpp-pppoe/jvpp_pppoe.c libjvpp_pppoe_la_CPPFLAGS = -Ijvpp-pppoe libjvpp_pppoe_la_LIBADD = $(JVPP_LIBS) -libjvpp_pppoe_la_DEPENDENCIES = libjvpp_common.la BUILT_SOURCES += jvpp-pppoe/io_fd_vpp_jvpp_pppoe_JVppPppoeImpl.h JAR_FILES += jvpp-pppoe-$(PACKAGE_VERSION).jar @@ -175,7 +170,6 @@ noinst_LTLIBRARIES += libjvpp_nat.la libjvpp_nat_la_SOURCES = jvpp-nat/jvpp_nat.c libjvpp_nat_la_CPPFLAGS = -Ijvpp-nat libjvpp_nat_la_LIBADD = $(JVPP_LIBS) -libjvpp_nat_la_DEPENDENCIES = libjvpp_common.la BUILT_SOURCES += jvpp-nat/io_fd_vpp_jvpp_nat_JVppNatImpl.h JAR_FILES += jvpp-nat-$(PACKAGE_VERSION).jar @@ -194,7 +188,6 @@ if ENABLE_IOAM_PLUGIN noinst_LTLIBRARIES += libjvpp_ioamtrace.la libjvpp_ioamtrace_la_SOURCES = jvpp-ioamtrace/jvpp_ioam_trace.c libjvpp_ioamtrace_la_LIBADD = $(JVPP_LIBS) -libjvpp_ioamtrace_la_DEPENDENCIES = libjvpp_common.la BUILT_SOURCES += jvpp-ioamtrace/io_fd_vpp_jvpp_ioamtrace_JVppIoamtraceImpl.h JAR_FILES += jvpp-ioamtrace-$(PACKAGE_VERSION).jar @@ -211,7 +204,6 @@ jvpp-ioamtrace/io_fd_vpp_jvpp_ioamtrace_ noinst_LTLIBRARIES += libjvpp_ioampot.la libjvpp_ioampot_la_SOURCES = jvpp-ioampot/jvpp_ioam_pot.c libjvpp_ioampot_la_LIBADD = $(JVPP_LIBS) -libjvpp_ioampot_la_DEPENDENCIES = libjvpp_common.la BUILT_SOURCES += jvpp-ioampot/io_fd_vpp_jvpp_ioampot_JVppIoampotImpl.h JAR_FILES += jvpp-ioampot-$(PACKAGE_VERSION).jar @@ -228,7 +220,6 @@ jvpp-ioampot/io_fd_vpp_jvpp_ioampot_JVpp noinst_LTLIBRARIES += libjvpp_ioamexport.la libjvpp_ioamexport_la_SOURCES = jvpp-ioamexport/jvpp_ioam_export.c libjvpp_ioamexport_la_LIBADD = $(JVPP_LIBS) -libjvpp_ioamexport_la_DEPENDENCIES = libjvpp_common.la BUILT_SOURCES += jvpp-ioamexport/io_fd_vpp_jvpp_ioamexport_JVppIoamexportImpl.h JAR_FILES += jvpp-ioamexport-$(PACKAGE_VERSION).jar Index: vpp-18.07.1/src/vpp-api/vapi/Makefile.am =================================================================== --- vpp-18.07.1.orig/src/vpp-api/vapi/Makefile.am +++ vpp-18.07.1/src/vpp-api/vapi/Makefile.am @@ -48,7 +48,7 @@ lib_LTLIBRARIES = libvapiclient.la libvapiclient_la_SOURCES = vapi.c -libvapiclient_la_DEPENDENCIES = libvapiclient.map +EXTRA_libvapiclient_la_DEPENDENCIES = libvapiclient.map libvapiclient_la_LIBADD = -lpthread -lm -lrt \ $(top_builddir)/libvppinfra.la \
