[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#960822: marked as done (autofdo should use the system libprotobuf)

Your message dated Fri, 22 Oct 2021 11:33:40 +0000
with message-id <E1mdsns-0008qn-9F@fasolo.debian.org>
and subject line Bug#960822: fixed in autofdo 0.19-2.1
has caused the Debian Bug report #960822,
regarding autofdo should use the system libprotobuf
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
960822: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=960822
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Source: autofdo
Version: 0.19-2
Severity: important
Tags: patch

autofdo should use the system libprotobuf instead of
an own copy.

debdiff attached.

diff -Nru autofdo-0.19/debian/control autofdo-0.19/debian/control
--- autofdo-0.19/debian/control	2019-10-27 21:52:39.000000000 +0200
+++ autofdo-0.19/debian/control	2019-10-28 12:28:07.000000000 +0200
@@ -8,6 +8,8 @@
   libgoogle-glog-dev, libgflags-dev,
   libelf-dev,
   llvm-9-dev,
+  protobuf-compiler,
+  libprotobuf-dev,
 Standards-Version: 4.4.1
 Homepage: https://github.com/google/autofdo
 
diff -Nru autofdo-0.19/debian/patches/link-atomic.diff autofdo-0.19/debian/patches/link-atomic.diff
--- autofdo-0.19/debian/patches/link-atomic.diff	2019-10-28 12:28:07.000000000 +0200
+++ autofdo-0.19/debian/patches/link-atomic.diff	1970-01-01 02:00:00.000000000 +0200
@@ -1,30 +0,0 @@
---- a/third_party/protobuf/configure.ac
-+++ b/third_party/protobuf/configure.ac
-@@ -189,6 +189,16 @@ AM_CONDITIONAL([HAVE_PTHREAD], [test "x$
- # We still keep this for improving pbconfig.h for unsupported platforms.
- AC_CXX_STL_HASH
- 
-+AC_MSG_CHECKING([whether linking wiht -latomic succeeds])
-+save_LIBS=$LIBS
-+LIBS="$LIBS -latomic"
-+AC_LINK_IFELSE(
-+  [AC_LANG_SOURCE([int main() { return 0; }])],
-+  [LIBATOMIC=-latomic; AC_MSG_RESULT(yes)],
-+  [LIBATOMIC=; AC_MSG_RESULT(no)])
-+AC_SUBST(LIBATOMIC)
-+LIBS=$save_LIBS
-+
- case "$target_os" in
-   mingw* | cygwin* | win* | aix*)
-     ;;
---- a/third_party/protobuf/src/Makefile.am
-+++ b/third_party/protobuf/src/Makefile.am
-@@ -211,7 +211,7 @@ libprotobuf_lite_la_SOURCES =
-   google/protobuf/io/zero_copy_stream.cc                       \
-   google/protobuf/io/zero_copy_stream_impl_lite.cc
- 
--libprotobuf_la_LIBADD = $(PTHREAD_LIBS)
-+libprotobuf_la_LIBADD = $(PTHREAD_LIBS) $(LIBATOMIC)
- libprotobuf_la_LDFLAGS = -version-info 15:1:0 -export-dynamic -no-undefined
- if HAVE_LD_VERSION_SCRIPT
- libprotobuf_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libprotobuf.map
diff -Nru autofdo-0.19/debian/patches/link-protobuf.diff autofdo-0.19/debian/patches/link-protobuf.diff
--- autofdo-0.19/debian/patches/link-protobuf.diff	1970-01-01 02:00:00.000000000 +0200
+++ autofdo-0.19/debian/patches/link-protobuf.diff	2019-10-28 12:28:07.000000000 +0200
@@ -0,0 +1,36 @@
+--- autofdo-0.19.orig/Makefile.am
++++ autofdo-0.19/Makefile.am
+@@ -1,14 +1,14 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+ PROTOBUF = third_party/protobuf
+-PROTOBUF_DEP = $(PROTOBUF)/src/.libs/libprotobuf.a
+-PROTOC = ./$(PROTOBUF)/src/protoc
++PROTOBUF_DEP = -lprotobuf
++PROTOC = protoc
+ 
+ $(PROTOBUF)/configure:
+ 	echo "[AUTOGEN] Preparing protobuf"
+ 	(cd $(PROTOBUF) ; autoreconf -f -i -Wall,no-obsolete)
+ 
+-$(PROTOC) $(PROTOBUF)/src/.libs/libprotobuf.a: $(PROTOBUF)/configure
++$(PROTOBUF)/src/.libs/libprotobuf.a: $(PROTOBUF)/configure
+ 	echo "[MAKE] Building protobuf"
+ 	(cd third_party/protobuf/; CC="$(CC)" CXX="$(CXX)" LDFLAGS="$(LDFLAGS_$(CONFIG)) -g $(PROTOBUF_LDFLAGS_EXTRA)" CPPFLAGS="$(PIC_CPPFLAGS) $(CPPFLAGS_$(CONFIG)) -g $(PROTOBUF_CPPFLAGS_EXTRA)" ./configure --disable-shared --enable-static $(PROTOBUF_CONFIG_OPTS))
+ 	make -C $(PROTOBUF)
+@@ -23,12 +23,12 @@ protoc_outputs = \
+ 	third_party/perf_data_converter/src/quipper/perf_stat.pb.cc \
+ 	third_party/perf_data_converter/src/quipper/perf_stat.pb.h
+ 
+-$(protoc_outputs): $(protoc_inputs) $(PROTOC)
++$(protoc_outputs): $(protoc_inputs)
+ 	$(PROTOC) --cpp_out=`dirname $<` -I`dirname $<` $(protoc_inputs)
+ 
+ ACLOCAL_AMFLAGS = -I m4
+-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/third_party/perf_data_converter/src/quipper -I./$(PROTOBUF)/src
+-AM_CXXFLAGS = -std=gnu++11 -I./$(PROTOBUF)/src
++AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/third_party/perf_data_converter/src/quipper
++AM_CXXFLAGS = -std=gnu++11
+ LIBS += -lpthread
+ LIBELF = -lelf
+ 
diff -Nru autofdo-0.19/debian/patches/series autofdo-0.19/debian/patches/series
--- autofdo-0.19/debian/patches/series	2019-10-28 12:27:55.000000000 +0200
+++ autofdo-0.19/debian/patches/series	2019-10-28 12:28:07.000000000 +0200
@@ -1,4 +1,4 @@
 link-libgflags.diff
 link-libglog.diff
 disable-rpath.diff
-link-atomic.diff
+link-protobuf.diff

--- End Message ---
--- Begin Message --- 
Source: autofdo
Source-Version: 0.19-2.1
Done: Adrian Bunk <bunk@debian.org>

We believe that the bug you reported is fixed in the latest version of
autofdo, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 960822@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Adrian Bunk <bunk@debian.org> (supplier of updated autofdo package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Format: 1.8
Date: Thu, 07 Oct 2021 15:13:26 +0300
Source: autofdo
Architecture: source
Version: 0.19-2.1
Distribution: unstable
Urgency: medium
Maintainer: Debian GCC Maintainers <debian-gcc@lists.debian.org>
Changed-By: Adrian Bunk <bunk@debian.org>
Closes: 960822 974802
Changes:
 autofdo (0.19-2.1) unstable; urgency=medium
 .
   * Non-maintainer upload.
   * Use the default LLVM. (Closes: #974802)
   * Backport upstream fix for FTBFS with LLVM 11.
   * Use the system libprotobuf. (Closes: #960822)
   * Remove vendored copies in dh_auto_clean,
     fixes building twice in a row.
Checksums-Sha1:
 7ee5e4b2263db1efedeb9fd3f907992b26495ba0 1902 autofdo_0.19-2.1.dsc
 a6456dd20220adbf09ef4ef12b8a4341f50932e0 5876 autofdo_0.19-2.1.debian.tar.xz
Checksums-Sha256:
 903676e56d21eb9a06fd37527212eefd55cd22bf23d8967bd6f64a8fb9f4be91 1902 autofdo_0.19-2.1.dsc
 4eec38a89088415c51ee9fe8fdefd91b2c97e1a523b90ec372df3b37e9da47f6 5876 autofdo_0.19-2.1.debian.tar.xz
Files:
 0b6e8255ed8da3da770c88fed4056083 1902 devel optional autofdo_0.19-2.1.dsc
 a958da005ff3dd79f65c9c9919e9033e 5876 devel optional autofdo_0.19-2.1.debian.tar.xz

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEOvp1f6xuoR0v9F3wiNJCh6LYmLEFAmFe5/MACgkQiNJCh6LY
mLG2chAAmpTas2ffeF4KmfQ47N3Q0rkME3acW0X6wOkl3eyrkuX/Gy0a/6PC1+c+
l/IumUvcN6dKJv1GOPSUXtSur+eDUAnsNvt83mesLeENbM/Xbu3ZDfePi3F4D2bM
WQa0ev9z4isJ7ZRVxThgaQ6GcZfrR4s2ZFFAOWrPJ66nHlQDmUtB0klflfpYNILw
CIeDb/XVyjpuYEQ9wKz9Ix/ylcHVXyn+FDJGjGMKX03DoR7JZcBz2a1NzU2SvEKz
HqXdBgykibRzxa6AXSPdW+wolQmShKKE08TZwqR7ImtpCk9DnfIl1gX2oPOVjC5A
z4aQn7mTabXY0fDc7VQAMjzIQS9XFcjSTUeoz6W/nS9wHX8YodxTfAVsR09LP9qt
K5rAbMi/fj/+IcD8gkaM4BboTYNGwikIfvSgTdO2bdFzeeWN10a5fP6XKJAKfTnc
AxBknW8Yrl9bsl0JACQl/SuV1qQqUVb1vt28fs3NLAC+rqoDEoxVnhPXmhtvvwDR
HpCj9dBieKpAnaN6eBTNkM4DCJ4d71cmKbwVVK7Pw+Q6BkE+DuX3pTTZnmPx3oQL
exYp5c61xpP3X9Z20svFY4Qr0q1nGXh+VIZILsgEY50hcwld5KjySV4/UT9D9jAy
qty7O+Xy3dpPgNXguYIN7Fy3/3pIKp2QkIN/YGrcxUk9UaJ7rOg=
=LRk/
-----END PGP SIGNATURE-----

--- End Message ---
Reply to: