Package: librcsb-core-wrapper
Version: 1.005-8
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu ubuntu-patch
Dear maintainers,
We've found that librcsb-core-wrapper fails to build from source in Ubuntu,
due to references to a generated header file that is renamed as part of the
build.
I don't understand why this wasn't an issue previously, since it seems
obvious that the .tab.c file is going to have references to .tab.h, but
regardless, the attached patch fixes the build failure on Ubuntu. I have
not tested whether the build failure also affects Debian, but I imagine it
would; and in any case the patch should not break anything in Debian.
Thanks,
--
Steve Langasek Give me a lever long enough and a Free OS
Debian Developer to set it on, and I can move the world.
Ubuntu Developer https://www.debian.org/
slanga...@ubuntu.com vor...@debian.org
diff -Nru librcsb-core-wrapper-1.005/debian/patches/generated-includes
librcsb-core-wrapper-1.005/debian/patches/generated-includes
--- librcsb-core-wrapper-1.005/debian/patches/generated-includes
1969-12-31 16:00:00.000000000 -0800
+++ librcsb-core-wrapper-1.005/debian/patches/generated-includes
2020-10-27 12:06:49.000000000 -0700
@@ -0,0 +1,19 @@
+Author: Steve Langasek <steve.langa...@ubuntu.com>
+Description: fix up include path for generated header file that's moved
+ The makefile renames the .tab.c and .tab.h files to .c and .h, but does
+ not fix up references from the .tab.h header from within the .c file.
+ I'm surprised this ever worked, but it doesn't work now.
+Last-Update: 2020-10-27
+
+Index: librcsb-core-wrapper-1.005/cif-parser/Makefile
+===================================================================
+--- librcsb-core-wrapper-1.005.orig/cif-parser/Makefile
++++ librcsb-core-wrapper-1.005/cif-parser/Makefile
+@@ -181,6 +181,7 @@
+ sh -c 'cd $(SRC_DIR); $(YACC) $(${^F:.y=_YACC_FLAGS}) ../$<'
+ mv $(^:.y=.tab.c) $(^:.y=.c)
+ mv $(^:.y=.tab.h) $(^:.y=.h)
++ sed -i -e's/\.tab\.h/\.h/' $(^:.y=.c)
+ libtool --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS_NONANSI) -c
$(^:.y=.c) -o obj/$(*)Parser.o
+
+ obj/%Scanner.o: $(SRC_DIR)/%Scanner.l $(OBJ_DIR)/%Parser.o
$(SRC_DIR)/%Parser.h
diff -Nru librcsb-core-wrapper-1.005/debian/patches/series
librcsb-core-wrapper-1.005/debian/patches/series
--- librcsb-core-wrapper-1.005/debian/patches/series 2019-12-21
10:36:10.000000000 -0800
+++ librcsb-core-wrapper-1.005/debian/patches/series 2020-10-27
12:06:59.000000000 -0700
@@ -16,3 +16,4 @@
xerces32.patch
gcc-8.patch
python3.patch
+generated-includes
