components/lcms/patches/000-configure.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Wed, 29 Aug 2012 11:05:56 -0700
changeset 957 255465c5756f
parent 174 187aa0541610
permissions -rw-r--r--
Close of build 04.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
174
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     1
--- configure	2009-10-30 08:57:45.000000000 -0700
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     2
+++ configure	2011-03-29 17:53:58.890691776 -0700
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     3
@@ -5246,13 +5246,8 @@
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     4
 
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     5
 
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     6
 # Configure python. AM_PATH_PYTHON is basically braindead
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     7
-PYTHON=''
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     8
 if test "$with_python" = 'yes'
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     9
 then
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    10
-
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    11
-
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    12
-
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    13
-
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    14
         if test -n "$PYTHON"; then
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    15
       # If the user set $PYTHON, use it and don't search something else.
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    16
       { echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.2" >&5
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    17
@@ -5400,8 +5395,7 @@
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    18
 if test "${am_cv_python_pythondir+set}" = set; then
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    19
   echo $ECHO_N "(cached) $ECHO_C" >&6
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    20
 else
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    21
-  am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    22
-     echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    23
+  am_cv_python_pythondir=`echo "${PYTHONMODULEDIR}"`
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    24
 fi
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    25
 { echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    26
 echo "${ECHO_T}$am_cv_python_pythondir" >&6; }
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    27
@@ -5417,8 +5411,7 @@
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    28
 if test "${am_cv_python_pyexecdir+set}" = set; then
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    29
   echo $ECHO_N "(cached) $ECHO_C" >&6
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    30
 else
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    31
-  am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    32
-     echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    33
+  am_cv_python_pyexecdir=`echo "${PYTHONMODULEDIR}"`
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    34
 fi
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    35
 { echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    36
 echo "${ECHO_T}$am_cv_python_pyexecdir" >&6; }
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    37
@@ -5436,7 +5429,8 @@
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    38
   if test -n "$PYTHON"
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    39
   then
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    40
 	LCMS_PYTHON_PREFIX=`$PYTHON -c "import sys; print sys.prefix"`
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    41
-	LCMS_PYEXECDIR=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1)"`
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    42
+	LCMS_PYTHON_VERSION=`$PYTHON -c "import sys; print sys.version[:3]"`
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    43
+	LCMS_PYEXECDIR=`echo "${PYTHONMODULEDIR}"`
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    44
     LCMS_PYINCLUDE=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_inc()"`
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    45
 	LCMS_PYLIB=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,1)"`
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    46
 	as_ac_File=`echo "ac_cv_file_$LCMS_PYINCLUDE/Python.h" | $as_tr_sh`
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    47
@@ -9481,7 +9475,7 @@
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    48
       ;;
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    49
 
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    50
     solaris*)
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    51
-      no_undefined_flag=' -z text'
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    52
+      no_undefined_flag=' -z text -z defs'
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    53
       if test "$GCC" = yes; then
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    54
 	wlarc='${wl}'
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    55
 	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    56
@@ -9489,11 +9483,11 @@
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    57
 	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    58
       else
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    59
 	wlarc=''
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    60
-	archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    61
+	archive_cmds='$CC $LTCFLAGS $LDFLAGS -G ${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    62
 	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    63
-  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    64
+  	$CC $LTCFLAGS $LDFLAGS -G ${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    65
       fi
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    66
-      hardcode_libdir_flag_spec='-R$libdir'
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    67
+      hardcode_libdir_flag_spec=''
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    68
       hardcode_shlibpath_var=no
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    69
       case $host_os in
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    70
       solaris2.[0-5] | solaris2.[0-5].*) ;;
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    71
@@ -11270,7 +11264,7 @@
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    72
 echo "$as_me: creating $ofile" >&6;}
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    73
 
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    74
   cat <<__EOF__ >> "$cfgfile"
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    75
-#! $SHELL
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    76
+#! $CONFIG_SHELL
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    77
 
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    78
 # `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    79
 # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)