| Subject: | PATCH: Allow building on RHEL6/Fedora |
Removed -mpreferred-stack-boundary=8 from Makefile.PL to allow building on armv7hl architecture
Lowered perl requirement to 5.10 to allow RHEL6 builds.
added auto detection of bits/c++config.h header file
| Subject: | image_subimagefind_makefile.patch |
diff -Naur old/lib/Image/SubImageFind.pm new/lib/Image/SubImageFind.pm
--- lib/Image/SubImageFind.pm 2011-09-11 07:16:23.000000000 +1000
+++ lib/Image/SubImageFind.pm 2014-03-19 10:54:19.500286139 +1100
@@ -17,7 +17,7 @@
#
package Image::SubImageFind;
-use 5.012003;
+use 5.010;
use strict;
use warnings;
diff -Naur old/Makefile.PL new/Makefile.PL
--- Makefile.PL 2011-09-11 06:21:38.000000000 +1000
+++ Makefile.PL 2014-03-19 10:50:06.735308541 +1100
@@ -1,10 +1,23 @@
-use 5.012003;
+use 5.010;
use ExtUtils::MakeMaker;
# See lib/ExtUtils/MakeMaker.pm for details of how to influence
# the contents of the Makefile that is written.
my $CC = "g++";
+use File::Spec();
+my $includes = '';
+if ($^O ne 'MSWin32') {
+ foreach my $include_file_path (`locate c++config.h`) {
+ chomp $include_file_path;
+ if (-e $include_file_path) {
+ my ($volume, $directories, $name) = File::Spec->splitpath($include_file_path);
+ $includes .= ' -I' . File::Spec->catdir($volume, $directories);
+ $includes =~ s/\/bits//smx;
+ }
+ }
+}
+
WriteMakefile(
NAME => 'Image::SubImageFind',
VERSION_FROM => 'lib/Image/SubImageFind.pm', # finds $VERSION
@@ -16,7 +29,7 @@
LD => '$(CC)',
XSOPT => '-C++',
LIBS => ['-lefence -lstdc++ -lfftw3 -lm '. `Magick++-config --ldflags --libs`],
- INC => '`Magick++-config --cppflags --cxxflags` -mpreferred-stack-boundary=8 -I procs/',
+ INC => '`Magick++-config --cppflags --cxxflags`' . $includes,
TYPEMAPS => ['perlobject.map'],
# Un-comment this if you add C files to link with later:
OBJECT => '$(O_FILES)', # link all the C files too