From unknown Thu Mar 28 20:33:10 2024 X-Loop: git-admin@x2go.org Subject: Bug#107: nx-libs makefile install messed up Reply-To: Orion Poplawski , 107@bugs.x2go.org Resent-From: Orion Poplawski Resent-To: x2go-dev@lists.berlios.de Resent-CC: X2Go Developers X-Loop: git-admin@x2go.org Resent-Date: Fri, 18 Jan 2013 21:18:01 +0000 Resent-Message-ID: Resent-Sender: git-admin@x2go.org X-X2Go-PR-Message: report 107 X-X2Go-PR-Package: nx-libs X-X2Go-PR-Keywords: patch Received: via spool by submit@bugs.x2go.org id=B.13585436428882 (code B); Fri, 18 Jan 2013 21:18:01 +0000 Received: (at submit) by bugs.x2go.org; 18 Jan 2013 21:14:02 +0000 Received: from mail.cora.nwra.com (mercury.cora.nwra.com [4.28.99.165]) by ymir (Postfix) with ESMTPS id 6117B5DB18 for ; Fri, 18 Jan 2013 22:14:02 +0100 (CET) Received: from barry.cora.nwra.com (barry.cora.nwra.com [10.10.20.7]) (authenticated bits=0) by mail.cora.nwra.com (8.14.4/8.14.4) with ESMTP id r0ILE0q5014768 (version=TLSv1/SSLv3 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=NO) for ; Fri, 18 Jan 2013 14:14:00 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=cora.nwra.com; s=default; t=1358543640; bh=K9wP3PP05RFT74gAIE9YXDh/gexQeim8no3yLNADc8s=; h=Message-ID:Date:From:MIME-Version:To:Subject:References: In-Reply-To:Content-Type; b=Pv6PT0Jdj8mTq1ylnaDR+Gg/udW1zMhjPUJlaEC1EvTmj6d0GGZ4MKWtLjwJ627kv 7/R62cdqG+++mo7GNTPZYImIDrFJ3txKMav2VpKB59MU1wuf5rTcyllsY1g0/h5hyj 1+RLRcMRliaaGS0egyhkdUOFo/01QVGhZoJZMidI= Message-ID: <50F9BB18.7000502@cora.nwra.com> Date: Fri, 18 Jan 2013 14:14:00 -0700 From: Orion Poplawski User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130110 Thunderbird/17.0.2 MIME-Version: 1.0 To: submit@bugs.x2go.org References: <50F5EE55.5010406@cora.nwra.com> <50F74239.6010802@cora.nwra.com> In-Reply-To: <50F74239.6010802@cora.nwra.com> Content-Type: multipart/mixed; boundary="------------090206020109090903010501" This is a multi-part message in MIME format. --------------090206020109090903010501 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Package: nx-libs Version: 3.5.0.17 Tags: patch On 01/16/2013 05:13 PM, Orion Poplawski wrote: > On 01/15/2013 05:03 PM, Orion Poplawski wrote: >> With current git head, the main nx-libs Makefile install gets it backwards >> installing the libraries: >> >> $(INSTALL_FILE) nx-X11/.build-exports/lib/*.so >> $(DESTDIR)$(NXLIBDIR)/X11/ >> $(COPY_SYMLINK) nx-X11/.build-exports/lib/*.so.* >> $(DESTDIR)$(NXLIBDIR)/X11/ >> >> The *.so and *.so.# are symlinks to *.so.#.#. Though some libs only have a >> single version (*.so -> *.so.#). >> > > Hmm, gets messed up earlier: > > -rwxr-xr-x. 1 orion nwra 10421469 Jan 16 17:07 > nx-libs-HEAD/nx-X11/.build-exports/lib/libNX_X11.so > lrwxrwxrwx. 1 orion nwra 12 Jan 16 17:07 > nx-libs-HEAD/nx-X11/.build-exports/lib/libNX_X11.so.6 -> libNX_X11.so > lrwxrwxrwx. 1 orion nwra 12 Jan 16 17:07 > nx-libs-HEAD/nx-X11/.build-exports/lib/libNX_X11.so.6.2 -> libNX_X11.so > lrwxrwxrwx. 1 orion nwra 26 Jan 16 17:06 > nx-libs-HEAD/nx-X11/exports/lib/libNX_X11.so -> ../../lib/X11/libNX_X11.so > lrwxrwxrwx. 1 orion nwra 28 Jan 16 17:06 > nx-libs-HEAD/nx-X11/exports/lib/libNX_X11.so.6 -> ../../lib/X11/libNX_X11.so.6 > lrwxrwxrwx. 1 orion nwra 30 Jan 16 17:06 > nx-libs-HEAD/nx-X11/exports/lib/libNX_X11.so.6.2 -> > ../../lib/X11/libNX_X11.so.6.2 > lrwxrwxrwx. 1 orion nwra 16 Jan 16 17:06 > nx-libs-HEAD/nx-X11/lib/X11/libNX_X11.so -> libNX_X11.so.6.2 > lrwxrwxrwx. 1 orion nwra 16 Jan 16 17:06 > nx-libs-HEAD/nx-X11/lib/X11/libNX_X11.so.6 -> libNX_X11.so.6.2 > -rwxr-xr-x. 1 orion nwra 10421469 Jan 16 17:06 > nx-libs-HEAD/nx-X11/lib/X11/libNX_X11.so.6.2 > > Don't have time to see how .build-exports gets populated yet. > Okay, here is the fix. -- Orion Poplawski Technical Manager 303-415-9701 x222 NWRA, Boulder Office FAX: 303-415-9702 3380 Mitchell Lane orion@nwra.com Boulder, CO 80301 http://www.nwra.com --------------090206020109090903010501 Content-Type: text/x-patch; name="nx-libs-install.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="nx-libs-install.patch" --- nx-libs-HEAD/Makefile.install 2013-01-15 14:35:47.000000000 -0700 +++ nx-libs-HEAD/Makefile 2013-01-18 12:22:20.039607600 -0700 @@ -92,22 +92,18 @@ # copy headers (for libnx-x11-dev) cp -aL nx-X11/exports/include/* nx-X11/.build-exports/include - # copy libs (for libnx-x11) - find nx-X11/exports/lib/ | egrep "^.*\.so$$" | while read libpath; do \ + # copy libs (for libnx-x11), we want the targets of the links + find nx-X11/exports/lib/ | grep -F ".so" | while read libpath; do \ libfile=$$(basename $$libpath); \ libdir=$$(dirname $$libpath); \ + link=$$(readlink $$libpath); \ \ mkdir -p $${libdir//exports/.build-exports}; \ - cp -L $$libpath $${libdir//exports/.build-exports}; \ - \ - find $$libdir/$$libfile.* | while read symlink; do \ - ln -s $$libfile $${libdir//exports/.build-exports}/$$(basename $$symlink); \ - done; \ + cp -a $${libpath/$$libfile/$$link} $${libdir//exports/.build-exports}; \ done; $(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/X11 - $(INSTALL_FILE) nx-X11/.build-exports/lib/*.so $(DESTDIR)$(NXLIBDIR)/X11/ - $(COPY_SYMLINK) nx-X11/.build-exports/lib/*.so.* $(DESTDIR)$(NXLIBDIR)/X11/ + $(COPY_SYMLINK) nx-X11/.build-exports/lib/*.so* $(DESTDIR)$(NXLIBDIR)/X11/ find nx-X11/.build-exports/include/ -type d | grep -v "include/X11/bitmaps" | \ while read dirname; do \ --------------090206020109090903010501--