|
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.1 KB
|
| Line | |
|---|
| 1 | #!/bin/bash
|
|---|
| 2 |
|
|---|
| 3 | package=gs-libiconv
|
|---|
| 4 | version=-1.14
|
|---|
| 5 |
|
|---|
| 6 | progname=$0
|
|---|
| 7 |
|
|---|
| 8 | source ../cascade-make/lib/cascade-lib.bash GEXTIMAGEMAGICK ../.. $*
|
|---|
| 9 |
|
|---|
| 10 | prefix=$GEXTIMAGEMAGICK_INSTALLED
|
|---|
| 11 |
|
|---|
| 12 | if [ "x$crossOS" = "xandroid" ] ; then
|
|---|
| 13 | # Stops configure generating a local 'stdint.h' in 'srclib' folder
|
|---|
| 14 | # (when this file was generated, caused no end of issues with chaining
|
|---|
| 15 | # standard header files, errors with time_t, pid_t etc)
|
|---|
| 16 | # Fix came from:
|
|---|
| 17 | # http://stackoverflow.com/questions/9053702/building-libiconv-fails-with-the-android-standalone-toolchain
|
|---|
| 18 |
|
|---|
| 19 | extra_config_args="gl_cv_header_working_stdint_h=yes"
|
|---|
| 20 | else
|
|---|
| 21 | extra_config_args=
|
|---|
| 22 | fi
|
|---|
| 23 |
|
|---|
| 24 |
|
|---|
| 25 | opt_run_untar $force_untar $auto_untar $package $version
|
|---|
| 26 | opt_run_configure $force_config $auto_config $package $version $prefix \
|
|---|
| 27 | $extra_config_args \
|
|---|
| 28 | --enable-static \
|
|---|
| 29 | --disable-shared \
|
|---|
| 30 |
|
|---|
| 31 | #export DYLIB_COMPATIBILITY_VERSION=7.0.0
|
|---|
| 32 |
|
|---|
| 33 | opt_run_make $compile $package $version
|
|---|
| 34 | opt_run_make $install $package $version "install"
|
|---|
| 35 | opt_run_make $clean $package $version "clean"
|
|---|
| 36 | opt_run_make $distclean $package $version "distclean"
|
|---|
| 37 |
|
|---|
| 38 | opt_run_tarclean $tarclean $package $version
|
|---|
Note:
See
TracBrowser
for help on using the repository browser.
