fbida: fix patch, use superenv

This commit is contained in:
Jack Nagel 2013-11-09 00:52:38 -06:00
parent 83978c09e6
commit fd998423bc

View file

@ -8,8 +8,6 @@ class Fbida < Formula
depends_on 'libexif'
depends_on 'jpeg'
env :std # uses 'cpp' in a pipeline
# Fix for build failure in fbida 2.09 (and earlier)
# Check again in fbida 2.10
def patches; DATA; end
@ -24,17 +22,16 @@ end
__END__
diff --git a/GNUmakefile b/GNUmakefile
index 2efae6c..af91be4 100644
index 2efae6c..9c45561 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -30,8 +30,8 @@ include $(srcdir)/mk/Autoconf.mk
@@ -30,8 +30,7 @@ include $(srcdir)/mk/Autoconf.mk
ac_jpeg_ver = $(shell \
$(call ac_init,for libjpeg version);\
- $(call ac_s_cmd,echo -e '\#include <jpeglib.h>\nJPEG_LIB_VERSION' \
- | cpp | tail -n 1);\
+ $(call ac_s_cmd,echo JPEG_LIB_VERSION \
+ | cpp -include jpeglib.h | tail -n 1);\
+ $(call ac_s_cmd,printf JPEG_LIB_VERSION | cpp -include jpeglib.h | tail -n 1);\
$(call ac_fini))
define make-config