zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Patch: explicitly use xbitmaps include dir in the automake package (#14128)

Browse Source 
* Patch: explicitly use xbitmaps include dir in the automake package

* Added dependencies required for autoreconf: libtool, autoconf, automake, m4
This commit is contained in:
Andras Wacha 2019-12-14 17:54:27 +01:00 committed by Adam J. Stewart
parent 7e668b1153
commit f757b6f4e5
2 changed files with 51 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
var/spack/repos/builtin/packages/motif/add_xbitmaps_dependency.patch Normal file
View File

@ -0,0 +1,36 @@
diff -Naur motif-2.3.8/ac_find_xbitmaps.m4 motif-2.3.8_patched/ac_find_xbitmaps.m4
--- motif-2.3.8/ac_find_xbitmaps.m4 1970-01-01 01:00:00.000000000 +0100
+++ motif-2.3.8_patched/ac_find_xbitmaps.m4 2019-12-11 16:01:58.463883900 +0100
@@ -0,0 +1,10 @@
+AC_DEFUN([AC_FIND_XBITMAPS],
+[
+
+AC_CHECK_HEADERS(X11/bitmaps/gray)
+
+CFLAGS="$CFLAGS `pkg-config xbitmaps --cflags`"
+AC_SUBST(CFLAGS)
+LIBS="$LIBS `pkg-config xbitmaps --libs`"
+AC_SUBST(LIBS)
+])
diff -Naur motif-2.3.8/AUTHORS motif-2.3.8_patched/AUTHORS
--- motif-2.3.8/AUTHORS 1970-01-01 01:00:00.000000000 +0100
+++ motif-2.3.8_patched/AUTHORS 2019-12-12 08:40:39.947561253 +0100
@@ -0,0 +1 @@
+Dummy AUTHORS file: upstream Motif did not supply this and autoreconf needs it.
\ No newline at end of file
diff -Naur motif-2.3.8/configure.ac motif-2.3.8_patched/configure.ac
--- motif-2.3.8/configure.ac 2017-12-05 13:43:54.000000000 +0100
+++ motif-2.3.8_patched/configure.ac 2019-12-11 16:01:58.467217264 +0100
@@ -274,6 +274,7 @@
AC_SUBST(LIB_XP)
AC_FIND_XFT
+AC_FIND_XBITMAPS
AC_IMAGE_SUPPORT
diff -Naur motif-2.3.8/NEWS motif-2.3.8_patched/NEWS
--- motif-2.3.8/NEWS 1970-01-01 01:00:00.000000000 +0100
+++ motif-2.3.8_patched/NEWS 2019-12-12 08:40:59.010963846 +0100
@@ -0,0 +1 @@
+Dummy NEWS file: upstream motif did not supply this but autoreconf needs it.

15
var/spack/repos/builtin/packages/motif/package.py
View File

@ -11,6 +11,8 @@ class Motif(AutotoolsPackage):
Motif - Graphical user interface (GUI)
specification and the widget toolkit
"""
force_autoreconf = True
homepage = "http://motif.ics.com/"
url = "http://cfhcable.dl.sourceforge.net/project/motif/Motif%202.3.8%20Source%20Code/motif-2.3.8.tar.gz"
@ -25,3 +27,16 @@ class Motif(AutotoolsPackage):
depends_on("libxfixes")
depends_on("xbitmaps")
depends_on("jpeg")
# we need the following for autoreconf
depends_on("automake", type="build")
depends_on("autoconf", type="build")
depends_on("m4", type="build")
depends_on("libtool", type="build")
patch('add_xbitmaps_dependency.patch')
def autoreconf(self, spec, prefix):
autoreconf = which('autoreconf')
with working_dir(self.configure_directory):
autoreconf('-ivf')