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

Re: Bug#916487: cmake: Please add small workaround for m68k



Control: forcemerge 911400 916487

Just realized that I already reported the issue as #911400, thus merging
with #916487. Re-attaching the patch just to make sure the patch lands
in the visible bug report.

Adrian

-- 
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer - glaubitz@debian.org
`. `'   Freie Universitaet Berlin - glaubitz@physik.fu-berlin.de
  `-    GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913
--- debian/rules.orig	2018-11-29 20:24:50.000000000 +0100
+++ debian/rules	2018-12-14 23:47:04.932357164 +0100
@@ -2,6 +2,15 @@
 
 include /usr/share/dpkg/pkg-info.mk
 
+# Temporary workaround due to libuv issues on m68k
+ifeq ($(DEB_HOST_ARCH), m68k)
+        export DEB_CFLAGS_MAINT_SET :=
+        export DEB_CXXFLAGS_MAINT_SET :=
+        SYSTEM_LIBS := --system-libs --no-system-libuv
+else
+        SYSTEM_LIBS := --system-libs
+endif
+
 export DEB_CXXFLAGS_MAINT_APPEND := $(shell dpkg-buildflags --get CPPFLAGS)
 export DEB_CFLAGS_MAINT_APPEND := $(shell dpkg-buildflags --get CPPFLAGS)
 export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
@@ -45,7 +54,7 @@
 override_dh_auto_configure: $(BUILD_FLAGS_FILE)
 	rm -rf Build && mkdir -p Build
 	cd Build && ../bootstrap --prefix=/usr --docdir=/share/doc/cmake --mandir=/share/man \
-	                         --init=../$(BUILD_FLAGS_FILE) --system-libs \
+	                         --init=../$(BUILD_FLAGS_FILE) $(SYSTEM_LIBS) \
 	                         --sphinx-man --sphinx-html --sphinx-flags="-D today=\"$(BUILD_DATE)\"" \
 	                         $(BOOTSTRAP_PARALLEL) --verbose
 

Reply to: