motif: fixup build after automake update #28232

It seemed easiest to avoid the need to autoreconf.
This commit is contained in:
Vladimír Čunát 2017-08-20 09:01:11 +02:00
parent a1bef771ee
commit 68c003b256
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 8 additions and 16 deletions

View File

@ -1,11 +0,0 @@
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,7 +27,6 @@ SUBDIRS = bindings bitmaps \
include \
tools \
clients \
- doc \
- demos
+ doc
AUTOMAKE_OPTIONS = 1.4
ACLOCAL_AMFLAGS = -I .

View File

@ -3,7 +3,7 @@
, expat, libjpeg, libpng, libiconv
, flex
, libXp, libXau
, demoSupport ? false, autoconf, automake
, demoSupport ? false
}:
# refer to the gentoo package
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
expat libjpeg libpng libiconv
];
nativeBuildInputs = [ pkgconfig flex ] ++ stdenv.lib.optionals (!demoSupport) [ autoconf automake ];
nativeBuildInputs = [ pkgconfig flex ];
propagatedBuildInputs = [ libXp libXau ];
@ -30,13 +30,16 @@ stdenv.mkDerivation rec {
makeFlags = [ "CFLAGS=-fno-strict-aliasing" ];
prePatch = ''rm lib/Xm/Xm.h'';
prePatch = ''
rm lib/Xm/Xm.h
'' + stdenv.lib.optionalString (!demoSupport) ''
sed '/^SUBDIRS =,^$/s/\<demos\>//' -i Makefile.{am,in}
'';
patches = [ ./Remove-unsupported-weak-refs-on-darwin.patch
./Use-correct-header-for-malloc.patch
./Add-X.Org-to-bindings-file.patch
]
++ stdenv.lib.optional (!demoSupport) ./Do-not-compile-demos.patch;
];
meta = with stdenv.lib; {
homepage = http://motif.ics.com;