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