Last change
on this file since 31808 was 31808, checked in by ak19, 7 years ago |
Related to commits 31803 and 31804. Committing the changes necessary for getting imagemagick to compile on Ubuntu 16.04. There was a new compilation error despite the aforementioned earlier commits: there needed to be --with-libiconv passed to the PKG-CONFIG package when configuring to work with glib. And the --with-libiconv flag moreover needed to not be at the end, so I've placed it as the first of the additional flags in the PKG-CONFIG.sh script. NOTE that I'm not sure if this flag is necessary on the Mac and have left it out for now. 2. This meant I could return to renaming the gs-modified libiconv package to gs-libiconv. (I'd reversed an earlier commit thinking the new compilation error was because the only libiconv related change had been to rename the package to have a gs- prefix, even though this seemed unlikely to be the cause. Since it wasn't the cause, have put the gs- renaming back.)
|
-
Property svn:executable
set to
*
|
File size:
1.2 KB
|
Line | |
---|
1 | #!/bin/bash
|
---|
2 |
|
---|
3 | package=pkg-config
|
---|
4 | #version=-0.25
|
---|
5 | version=-0.27
|
---|
6 |
|
---|
7 | progname=$0
|
---|
8 |
|
---|
9 | source ../cascade-make/lib/cascade-lib.bash GEXTIMAGEMAGICK ../.. $*
|
---|
10 |
|
---|
11 | prefix=$GEXTIMAGEMAGICK_INSTALLED
|
---|
12 |
|
---|
13 | export CFLAGS="$CFLAGS -I$GEXTIMAGEMAGICK_INSTALLED/include"
|
---|
14 | export CXXFLAGS="$CXXFLAGS -I$GEXTIMAGEMAGICK_INSTALLED/include"
|
---|
15 | export LDFLAGS="$LDFLAGS -L$GEXTIMAGEMAGICK_INSTALLED/lib"
|
---|
16 | export DYLD_LIBRARY_PATH=
|
---|
17 |
|
---|
18 | opt_run_untar $force_untar $auto_untar $package $version
|
---|
19 |
|
---|
20 | # On Mac: if there's an error about
|
---|
21 | # "#error GNU libiconv not in use but included iconv.h is from libiconv"
|
---|
22 | # then prepend --with-libiconv before --with-internal-glib for darwin too
|
---|
23 | if [ "x$GSDLOS" = "xdarwin" ] ; then
|
---|
24 | LIBS=-lintl opt_run_configure $force_config $auto_config $package $version $prefix \
|
---|
25 | --with-internal-glib --disable-shared
|
---|
26 | else
|
---|
27 | opt_run_configure $force_config $auto_config $package $version $prefix \
|
---|
28 | --with-libiconv --with-internal-glib --disable-shared
|
---|
29 | fi
|
---|
30 |
|
---|
31 | opt_run_make $compile $package $version
|
---|
32 | opt_run_make $install $package $version "install"
|
---|
33 | opt_run_make $clean $package $version "clean"
|
---|
34 | opt_run_make $distclean $package $version "distclean"
|
---|
35 |
|
---|
36 | opt_run_tarclean $tarclean $package $version
|
---|
Note:
See
TracBrowser
for help on using the repository browser.