diff options
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/patches/s390x-ftbfs.patch | 13 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 20 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 8badc9c..18947b8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +bibletime (2.10.1-2) UNRELEASED; urgency=medium + + * Add patch to build without pie, fixes FTBFS on s390x (Closes: #767209) + + -- Dimitri John Ledkov <dimitri.j.ledkov@linux.intel.com> Mon, 03 Nov 2014 11:55:54 +0000 + bibletime (2.10.1-1) unstable; urgency=medium [ David Sanders ] diff --git a/debian/patches/s390x-ftbfs.patch b/debian/patches/s390x-ftbfs.patch new file mode 100644 index 0000000..837b5ca --- /dev/null +++ b/debian/patches/s390x-ftbfs.patch @@ -0,0 +1,13 @@ +Index: bibletime-2.10.1/CMakeLists.txt +=================================================================== +--- bibletime-2.10.1.orig/CMakeLists.txt ++++ bibletime-2.10.1/CMakeLists.txt +@@ -205,7 +205,7 @@ IF(MSVC) + SET(CMAKE_CXX_FLAGS_DEBUG "-DNO_DBUS -DSWUSINGDLL /MDd /Zc:wchar_t- /W1 /D_UNICODE /DUNICODE /Zc:wchar_t /Od") + SET(BibleTime_LDFLAGS "${BibleTime_LDFLAGS} /SUBSYSTEM:WINDOWS") + ELSE() +- SET(BibleTime_CFLAGS "${BibleTime_CFLAGS} -Wextra -fpie -fexceptions") ++ SET(BibleTime_CFLAGS "${BibleTime_CFLAGS} -Wextra -fexceptions") + SET(CMAKE_CXX_FLAGS_RELEASE "-O2") + SET(CMAKE_CXX_FLAGS_DEBUG "-ggdb") + IF(APPLE) diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..cbc1051 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +s390x-ftbfs.patch |