public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Samuli Suominen (ssuominen)" <ssuominen@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in media-libs/libpng/files: libpng-1.4.x-update.sh
Date: Sun, 16 May 2010 18:25:37 +0000 (UTC)	[thread overview]
Message-ID: <20100516182537.B051C2C04D@corvid.gentoo.org> (raw)

ssuominen    10/05/16 18:25:37

  Modified:             libpng-1.4.x-update.sh
  Log:
  Update libpng-1.4.x-update.sh to use qfile for finding .la files (based on xcb-rebuilder.sh from x11-libs/libxcb, thanks to Rémi Cardona for pointing this out).
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.7                  media-libs/libpng/files/libpng-1.4.x-update.sh

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libpng/files/libpng-1.4.x-update.sh?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libpng/files/libpng-1.4.x-update.sh?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libpng/files/libpng-1.4.x-update.sh?r1=1.6&r2=1.7

Index: libpng-1.4.x-update.sh
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libpng/files/libpng-1.4.x-update.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libpng-1.4.x-update.sh	13 May 2010 20:05:18 -0000	1.6
+++ libpng-1.4.x-update.sh	16 May 2010 18:25:37 -0000	1.7
@@ -1,14 +1,16 @@
 #!/bin/bash
 
-echo "Try revdep-rebuild first."
-echo "This script will rename -lpng12 and libpng12.la to -lpng14 and libpng14.la"
-echo "in your system libdir libtool .la files without asking permission."
+. /etc/init.d/functions.sh
 
-[[ -d /usr/lib64 ]] && lib_suffix=64
+if ! type -p qfile >/dev/null; then
+	einfo "Please install app-portage/portage-utils."
+	exit 1
+fi
 
-libdir=/usr/lib${lib_suffix}
-
-find ${libdir} -name '*.la' | xargs sed -i -e '/^dependency_libs/s:-lpng12:-lpng14:'
-find ${libdir} -name '*.la' | xargs sed -i -e '/^dependency_libs/s:libpng12.la:libpng14.la:'
-
-# WTFPL-2
+einfo "Fixing broken libtool archives (.la)"
+for i in $(qlist -a | grep "\.la$"); do
+	sed -i \
+		-e '/^dependency_libs/s:-lpng12:-lpng14:g' \
+		-e '/^dependency_libs/s:libpng12.la:libpng14.la:g' \
+                "${i}" 2>/dev/null
+done






             reply	other threads:[~2010-05-16 18:25 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-05-16 18:25 Samuli Suominen (ssuominen) [this message]
  -- strict thread matches above, loose matches on Subject: below --
2011-01-29 19:14 [gentoo-commits] gentoo-x86 commit in media-libs/libpng/files: libpng-1.4.x-update.sh Samuli Suominen (ssuominen)
2010-10-17 20:07 Mike Frysinger (vapier)
2010-06-30 17:12 Jeremy Olexa (darkside)
2010-05-13 20:05 Samuli Suominen (ssuominen)
2010-05-11 10:54 Samuli Suominen (ssuominen)
2010-05-11 10:54 Samuli Suominen (ssuominen)
2010-05-11  8:03 Samuli Suominen (ssuominen)
2010-05-10 23:04 Samuli Suominen (ssuominen)
2010-05-10 18:10 Samuli Suominen (ssuominen)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20100516182537.B051C2C04D@corvid.gentoo.org \
    --to=ssuominen@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox