| 1 |
commit: 86bdb5ca9634d10a4bcf7d24d2869508987af78d |
| 2 |
Author: orbea <orbea <AT> riseup <DOT> net> |
| 3 |
AuthorDate: Sun May 8 15:35:37 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 17 01:06:30 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86bdb5ca |
| 7 |
|
| 8 |
app-backup/bacula: Fix build with slibtool |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/790140 |
| 11 |
Signed-off-by: orbea <orbea <AT> riseup.net> |
| 12 |
Closes: https://github.com/gentoo/gentoo/pull/25386 |
| 13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 14 |
|
| 15 |
app-backup/bacula/bacula-11.0.6.ebuild | 3 + |
| 16 |
app-backup/bacula/files/bacula-fix-slibtool.patch | 126 ++++++++++++++++++++++ |
| 17 |
2 files changed, 129 insertions(+) |
| 18 |
|
| 19 |
diff --git a/app-backup/bacula/bacula-11.0.6.ebuild b/app-backup/bacula/bacula-11.0.6.ebuild |
| 20 |
index 280ae3cb775c..9cd91adc9e56 100644 |
| 21 |
--- a/app-backup/bacula/bacula-11.0.6.ebuild |
| 22 |
+++ b/app-backup/bacula/bacula-11.0.6.ebuild |
| 23 |
@@ -125,6 +125,9 @@ src_prepare() { |
| 24 |
# fix soname in libbaccat.so bug #602952 |
| 25 |
eapply -p0 "${FILESDIR}/bacula-fix-sonames.patch" |
| 26 |
|
| 27 |
+ # fix the build with slibtool bug #790140 |
| 28 |
+ eapply -p1 "${FILESDIR}/bacula-fix-slibtool.patch" |
| 29 |
+ |
| 30 |
# do not strip binaries |
| 31 |
sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die |
| 32 |
sed -i -e "s/strip /# strip /" src/console/Makefile.in || die |
| 33 |
|
| 34 |
diff --git a/app-backup/bacula/files/bacula-fix-slibtool.patch b/app-backup/bacula/files/bacula-fix-slibtool.patch |
| 35 |
new file mode 100644 |
| 36 |
index 000000000000..b1bd82da8557 |
| 37 |
--- /dev/null |
| 38 |
+++ b/app-backup/bacula/files/bacula-fix-slibtool.patch |
| 39 |
@@ -0,0 +1,126 @@ |
| 40 |
+commit cfad44e501f71e1576f1106a97350ea9b229ac1a |
| 41 |
+Author: orbea <orbea@××××××.net> |
| 42 |
+Date: Sun May 8 08:12:38 2022 -0700 |
| 43 |
+ |
| 44 |
+ build: Fix the build with slibtool |
| 45 |
+ |
| 46 |
+ * cats: soname is a linker argument |
| 47 |
+ * stored: Linker -lfoo flags are for external dependencies |
| 48 |
+ |
| 49 |
+diff --git a/src/cats/Makefile.in b/src/cats/Makefile.in |
| 50 |
+index d30cc75..f06266f 100644 |
| 51 |
+--- a/src/cats/Makefile.in |
| 52 |
++++ b/src/cats/Makefile.in |
| 53 |
+@@ -135,21 +135,21 @@ libbaccats.la: Makefile cats_null.lo |
| 54 |
+ libbaccats-mysql.la: Makefile $(MYSQL_LOBJS) |
| 55 |
+ @echo "Making $@ ..." |
| 56 |
+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(MYSQL_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE) \ |
| 57 |
+- -soname libbaccats-$(LIBBACCATS_LT_RELEASE).so $(MYSQL_LIBS) |
| 58 |
++ -Wl,-soname,libbaccats-$(LIBBACCATS_LT_RELEASE).so $(MYSQL_LIBS) |
| 59 |
+ |
| 60 |
+ libbaccats-postgresql.la: Makefile $(POSTGRESQL_LOBJS) |
| 61 |
+ @echo "Making $@ ..." |
| 62 |
+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(POSTGRESQL_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE) \ |
| 63 |
+- -soname libbaccats-$(LIBBACCATS_LT_RELEASE).so $(POSTGRESQL_LIBS) |
| 64 |
++ -Wl,-soname,libbaccats-$(LIBBACCATS_LT_RELEASE).so $(POSTGRESQL_LIBS) |
| 65 |
+ |
| 66 |
+ libbaccats-sqlite3.la: Makefile $(SQLITE_LOBJS) |
| 67 |
+ @echo "Making $@ ..." |
| 68 |
+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(SQLITE_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE) \ |
| 69 |
+- -soname libbaccats-$(LIBBACCATS_LT_RELEASE).so $(SQLITE_LIBS) |
| 70 |
++ -Wl,-soname,libbaccats-$(LIBBACCATS_LT_RELEASE).so $(SQLITE_LIBS) |
| 71 |
+ #libbaccats-dbi.la: Makefile $(DBI_LOBJS) |
| 72 |
+ # @echo "Making $@ ..." |
| 73 |
+ # $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(DBI_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE) \ |
| 74 |
+-# -soname libbaccats-$(LIBBACCATS_LT_RELEASE).so $(DBI_LIBS) |
| 75 |
++# -Wl,-soname,libbaccats-$(LIBBACCATS_LT_RELEASE).so $(DBI_LIBS) |
| 76 |
+ |
| 77 |
+ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status |
| 78 |
+ cd $(topdir) \ |
| 79 |
+diff --git a/src/stored/Makefile.in b/src/stored/Makefile.in |
| 80 |
+index cfc3aa7..bead1c7 100644 |
| 81 |
+--- a/src/stored/Makefile.in |
| 82 |
++++ b/src/stored/Makefile.in |
| 83 |
+@@ -123,7 +123,7 @@ LZO_INC= @LZO_INC@ |
| 84 |
+ TOKYOCABINET_LIBS = @TOKYOCABINET_LIBS@ |
| 85 |
+ TOKYOCABINET_INC = @TOKYOCABINET_INC@ |
| 86 |
+ |
| 87 |
+-SD_LIBS = -lbacsd -lbaccfg -lbac -lbacfind |
| 88 |
++SD_LIBS = libbacsd.la ../lib/libbaccfg.la ../lib/libbac.la ../findlib/libbacfind.la |
| 89 |
+ |
| 90 |
+ |
| 91 |
+ .SUFFIXES: .c .o .lo |
| 92 |
+@@ -153,7 +153,7 @@ bacula-sd: Makefile libbacsd.la $(SDOBJS) \ |
| 93 |
+ ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) \ |
| 94 |
+ ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) |
| 95 |
+ @echo "Linking $@ ..." |
| 96 |
+- $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib \ |
| 97 |
++ $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) \ |
| 98 |
+ -o $@ $(SDOBJS) $(ZLIBS) \ |
| 99 |
+ $(SD_LIBS) -lm $(DLIB) $(LIBS) $(WRAPLIBS) \ |
| 100 |
+ $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) |
| 101 |
+@@ -206,7 +206,7 @@ btape.o: btape.c |
| 102 |
+ -I$(basedir) $(DINCLUDE) $(CFLAGS) $< |
| 103 |
+ |
| 104 |
+ btape: Makefile $(TAPEOBJS) libbacsd.la drivers ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) |
| 105 |
+- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(TAPEOBJS) \ |
| 106 |
++ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -o $@ $(TAPEOBJS) \ |
| 107 |
+ $(SD_LIBS) $(DLIB) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) |
| 108 |
+ |
| 109 |
+ |
| 110 |
+@@ -216,7 +216,7 @@ cloud_test.o: cloud_test.c |
| 111 |
+ -I$(basedir) $(DINCLUDE) $(CFLAGS) $< |
| 112 |
+ |
| 113 |
+ cloud_test: Makefile cloud_test.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) $(BLSOBJS) libbacsd.la drivers |
| 114 |
+- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(CLOUDTESTOBJS) $(DLIB) \ |
| 115 |
++ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -o $@ $(CLOUDTESTOBJS) $(DLIB) \ |
| 116 |
+ $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) |
| 117 |
+ |
| 118 |
+ bcloud.o: bcloud.c |
| 119 |
+@@ -225,7 +225,7 @@ bcloud.o: bcloud.c |
| 120 |
+ -I$(basedir) $(DINCLUDE) $(S3_INC) $(CFLAGS) $< |
| 121 |
+ |
| 122 |
+ bcloud: Makefile bcloud.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) $(BLSOBJS) libbacsd.la drivers |
| 123 |
+- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(CLOUDCLIOBJS) $(DLIB) \ |
| 124 |
++ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -o $@ $(CLOUDCLIOBJS) $(DLIB) \ |
| 125 |
+ $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(S3_LIBS) |
| 126 |
+ |
| 127 |
+ bls.o: bls.c |
| 128 |
+@@ -235,7 +235,7 @@ bls.o: bls.c |
| 129 |
+ |
| 130 |
+ bls: Makefile $(BLSOBJS) libbacsd.la drivers ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) |
| 131 |
+ @echo "Compiling $<" |
| 132 |
+- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BLSOBJS) $(DLIB) \ |
| 133 |
++ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -o $@ $(BLSOBJS) $(DLIB) \ |
| 134 |
+ $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) |
| 135 |
+ |
| 136 |
+ bextract.o: bextract.c |
| 137 |
+@@ -245,7 +245,7 @@ bextract.o: bextract.c |
| 138 |
+ |
| 139 |
+ bextract: Makefile $(BEXTOBJS) libbacsd.la drivers ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) |
| 140 |
+ @echo "Compiling $<" |
| 141 |
+- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) $(ZLIBS) $(LZO_LIBS) \ |
| 142 |
++ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -o $@ $(BEXTOBJS) $(DLIB) $(ZLIBS) $(LZO_LIBS) \ |
| 143 |
+ $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) |
| 144 |
+ |
| 145 |
+ bscan.o: bscan.c |
| 146 |
+@@ -255,8 +255,8 @@ bscan.o: bscan.c |
| 147 |
+ |
| 148 |
+ bscan: Makefile $(SCNOBJS) libbacsd.la drivers ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \ |
| 149 |
+ ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) |
| 150 |
+- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SCNOBJS) \ |
| 151 |
+- $(SD_LIBS) -lbacsql -lbaccats $(DB_LIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) |
| 152 |
++ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -o $@ $(SCNOBJS) $(SD_LIBS) ../cats/libbacsql.la ../cats/libbaccats.la \ |
| 153 |
++ $(DB_LIBS) $(ZLIBS) ../findlib/libbacfind.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) |
| 154 |
+ |
| 155 |
+ bcopy.o: bcopy.c |
| 156 |
+ @echo "Compiling $<" |
| 157 |
+@@ -264,7 +264,7 @@ bcopy.o: bcopy.c |
| 158 |
+ -I$(basedir) $(DINCLUDE) $(CFLAGS) $< |
| 159 |
+ |
| 160 |
+ bcopy: Makefile $(COPYOBJS) libbacsd.la drivers ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) |
| 161 |
+- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(COPYOBJS) \ |
| 162 |
++ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -o $@ $(COPYOBJS) \ |
| 163 |
+ $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) |
| 164 |
+ |
| 165 |
+ cloud_parts_test: Makefile cloud_parts.c |
Archives