Attachment 37424 Details for Bug 29282 – Teach mklib/minstall to properly install libraries on cygwin

[patch] Teach mklib/minstall to properly install libraries on cygwin

0003-Cygwin-Teach-mklib-minstall-to-properly-install-libr.patch (text/plain), 4.63 KB, created by Jon Turney on 2010-07-28 08:57:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jon Turney

Created: 2010-07-28 08:57:46 UTC

Size: 4.63 KB

patch

obsolete

>From 0553912e68b9dd47448348e68160eafb4d579c34 Mon Sep 17 00:00:00 2001
>From: Jon TURNEY <jon.turney@dronecode.org.uk>
>Date: Sat, 24 Jul 2010 12:05:34 +0100
>Subject: [PATCH 3/3] Cygwin: Teach mklib/minstall to properly install libraries on cygwin
>
>Teach mklib/minstall more about cygwin so libraries are properly installed
>
>Have mklib install the .dll into the lib/ staging directory as well
>
>Have minstall install the .dll into PREFIX/bin at the same time as
>installing the .dll.a link library into PREFIX/lib
>
>mklib uses a '-' rather than a '.' as the separator before the version
>number in library names on cygwin.  Change the install globs so they match
>library names like that.
>
>Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
>---
> bin/minstall |   21 ++++++++++++++++++++-
> bin/mklib    |    5 +++++
> configure.ac |   26 ++++++++++++++++----------
> 3 files changed, 41 insertions(+), 11 deletions(-)
>
>diff --git a/bin/minstall b/bin/minstall
>index 1300258..094ec0c 100755
>--- a/bin/minstall
>+++ b/bin/minstall
>@@ -31,7 +31,7 @@ if [ $# -ge 2 ] ; then
> 
> 	# Last cmd line arg is the dest dir
> 	for FILE in $@ ; do
>-		DEST="$FILE"
>+		DESTDIR="$FILE"
> 	done
> 
> 	# Loop over args, moving them to DEST directory
>@@ -42,6 +42,25 @@ if [ $# -ge 2 ] ; then
> 			exit 0
> 		fi
> 
>+                DEST=$DESTDIR
>+
>+                # On CYGWIN, because DLLs are loaded by the native Win32 loader,
>+                # they are installed in the executable path.  Stub libraries used
>+                # only for linking are installed in the library path
>+                case `uname` in
>+                    CYGWIN*)
>+                        case $FILE in
>+                            *.dll)
>+                                DEST="$DEST/../bin"
>+                                ;;
>+                            *)
>+                                ;;
>+                        esac
>+	                ;;
>+                    *)
>+                        ;;
>+                esac
>+
> 		PWDSAVE=`pwd`
> 
> 		# determine file's type
>diff --git a/bin/mklib b/bin/mklib
>index 5478ef7..bc554c1 100755
>--- a/bin/mklib
>+++ b/bin/mklib
>@@ -1019,4 +1019,9 @@ if [ ${INSTALLDIR} != "." ] ; then
>     echo "mklib: Installing" ${FINAL_LIBS} "in" ${INSTALLDIR}
>     test -d ${INSTALLDIR} || mkdir -p ${INSTALLDIR}
>     mv ${FINAL_LIBS} ${INSTALLDIR}/
>+
>+    if [ "x${FINAL_BINS}" != "x" ] ; then
>+        echo "mklib: Installing" ${FINAL_BINS} "in" ${INSTALLDIR}
>+        mv ${FINAL_BINS} ${INSTALLDIR}/
>+    fi
> fi
>diff --git a/configure.ac b/configure.ac
>index 9619597..63cefab 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -258,6 +258,8 @@ fi
> dnl
> dnl library names
> dnl
>+LIB_PREFIX_GLOB='lib'
>+LIB_VERSION_SEPARATOR='.'
> if test "$enable_static" = yes; then
>     LIB_EXTENSION='a'
> else
>@@ -265,7 +267,10 @@ else
>     darwin* )
>         LIB_EXTENSION='dylib' ;;
>     cygwin* )
>-        LIB_EXTENSION='dll.a' ;;
>+        dnl prefix can be 'cyg' or 'lib'
>+        LIB_PREFIX_GLOB='???'
>+        LIB_VERSION_SEPARATOR='-'
>+        LIB_EXTENSION='dll' ;;
>     aix* )
>         LIB_EXTENSION='a' ;;
>     * )
>@@ -283,15 +288,16 @@ GLESv1_CM_LIB_NAME='lib$(GLESv1_CM_LIB).'${LIB_EXTENSION}
> GLESv2_LIB_NAME='lib$(GLESv2_LIB).'${LIB_EXTENSION}
> VG_LIB_NAME='lib$(VG_LIB).'${LIB_EXTENSION}
> 
>-GL_LIB_GLOB='lib$(GL_LIB).*'${LIB_EXTENSION}'*'
>-GLU_LIB_GLOB='lib$(GLU_LIB).*'${LIB_EXTENSION}'*'
>-GLUT_LIB_GLOB='lib$(GLUT_LIB).*'${LIB_EXTENSION}'*'
>-GLW_LIB_GLOB='lib$(GLW_LIB).*'${LIB_EXTENSION}'*'
>-OSMESA_LIB_GLOB='lib$(OSMESA_LIB).*'${LIB_EXTENSION}'*'
>-EGL_LIB_GLOB='lib$(EGL_LIB).*'${LIB_EXTENSION}'*'
>-GLESv1_CM_LIB_GLOB='lib$(GLESv1_CM_LIB).*'${LIB_EXTENSION}'*'
>-GLESv2_LIB_GLOB='lib$(GLESv2_LIB).*'${LIB_EXTENSION}'*'
>-VG_LIB_GLOB='lib$(VG_LIB).*'${LIB_EXTENSION}'*'
>+GL_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GL_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
>+GLU_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLU_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
>+GLUT_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLUT_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
>+GLW_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLW_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
>+OSMESA_LIB_GLOB=${LIB_PREFIX_GLOB}'$(OSMESA_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
>+EGL_LIB_GLOB=${LIB_PREFIX_GLOB}'$(EGL_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
>+EGL_LIB_GLOB=${LIB_PREFIX_GLOB}'$(EGL_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
>+GLESv1_CM_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLESv1_CM_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
>+GLESv2_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLESv2_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
>+VG_LIB_GLOB=${LIB_PREFIX_GLOB}'$(VG_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
> 
> AC_SUBST([GL_LIB_NAME])
> AC_SUBST([GLU_LIB_NAME])
>-- 
>1.7.1
>

Actions: View | Splinter Review

Attachments on bug 29282: 37422 | 37423 | 37424 | 38305

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.