Skip to Content.
Sympa Menu

sm-commit - Re: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Ladislav Hagara (7ce03ea5123b88fde4aa770da286cebee4a0f8b5)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ladislav Hagara <ladislav.hagara AT unob.cz>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: Re: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Ladislav Hagara (7ce03ea5123b88fde4aa770da286cebee4a0f8b5)
  • Date: Thu, 13 Jan 2011 01:20:53 +0100

> GIT changes to devel-xorg-modular grimoire by Ladislav Hagara <hgr AT vabo.cz>:
>
> xorg-extras/libpthread-stubs/HISTORY | 4 ++
> xorg-extras/libpthread-stubs/INSTALL | 3 +
> xorg-extras/libpthread-stubs/UP_TRIGGERS | 28 +++++++++------
> xorg-extras/libpthread-stubs/libpthread-stubs.la | 41
> +++++++++++++++++++++++
> 4 files changed, 65 insertions(+), 11 deletions(-)
>
> New commits:
> commit 7ce03ea5123b88fde4aa770da286cebee4a0f8b5
> Author: Ladislav Hagara <hgr AT vabo.cz>
> Commit: Ladislav Hagara <hgr AT vabo.cz>
>
> libpthread-stubs: UP_TRIGGERS updated and fake libpthread-stubs.la
> installed
>
> diff --git a/xorg-extras/libpthread-stubs/HISTORY
> b/xorg-extras/libpthread-stubs/HISTORY
> index a4ed52b..7d7fcf3 100644
> --- a/xorg-extras/libpthread-stubs/HISTORY
> +++ b/xorg-extras/libpthread-stubs/HISTORY
> @@ -1,3 +1,7 @@
> +2011-01-12 Ladislav Hagara <hgr AT vabo.cz>
> + * UP_TRIGGERS: updated to re-cast all spells needed
> libpthread-stubs.so
> + * INSTALL, libpthread-stubs.la: fake libpthread-stubs.la installed
> +
> 2010-12-22 Pol Vinogradov <vin.public AT gmail.com>
> * UP_TRIGGERS: added to fix depends after update
>
> diff --git a/xorg-extras/libpthread-stubs/INSTALL
> b/xorg-extras/libpthread-stubs/INSTALL
> new file mode 100755
> index 0000000..7967c30
> --- /dev/null
> +++ b/xorg-extras/libpthread-stubs/INSTALL
> @@ -0,0 +1,3 @@
> +default_install &&
> +
> +install -m 0755 $SPELL_DIRECTORY/libpthread-stubs.la
> ${INSTALL_ROOT}/usr/lib/
> diff --git a/xorg-extras/libpthread-stubs/UP_TRIGGERS
> b/xorg-extras/libpthread-stubs/UP_TRIGGERS
> index ad78298..2cbdab2 100755
> --- a/xorg-extras/libpthread-stubs/UP_TRIGGERS
> +++ b/xorg-extras/libpthread-stubs/UP_TRIGGERS
> @@ -1,12 +1,18 @@
> -local OLD_SPELL_VERSION=""
> -spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)"
> -if [ "${VERSION:1:2}" != "${OLD_SPELL_VERSION:1:2}" ]; then
> - message "This is a possibly incompatible update of libpthread-stubs..."
> - message "Figuring out what spells need to be recast, this may take a
> while."
> - for each in $(show_up_depends $SPELL 3); do
> - if gaze install-spell $each | xargs readelf -d 2> /dev/null |
> - grep -q libpthread-stubs; then
> - up_trigger $each cast_self
> - fi
> - done
> +if spell_ok $SPELL; then
> + local OLD_SPELL_VERSION="$(installed_version $SPELL)"
> + if [[ "${VERSION}" != "${OLD_SPELL_VERSION}" ]]; then
> + message "This is an ABI incompatible update of libpthread-stubs..."
> + message "Determining which spells need to be recast, this may take a
> while."
> +
> + for other_spell in $(gaze installed | cut -d: -f1); do
> + if gaze install $other_spell \
> + | xargs file -e apptype -e ascii -e compress -e tar \
> + | grep '\<ELF\>.*\<dynamically linked\>' \
> + | cut -d: -f1 \
> + | xargs readelf -d 2> /dev/null \
> + | grep -q -P 'NEEDED\)\s*Shared library:
> \[libpthread-stubs.so.0'; then
> + up_trigger $other_spell cast_self
> + fi
> + done
> + fi
> fi
> diff --git a/xorg-extras/libpthread-stubs/libpthread-stubs.la
> b/xorg-extras/libpthread-stubs/libpthread-stubs.la
> new file mode 100755
> index 0000000..7d5d063
> --- /dev/null
> +++ b/xorg-extras/libpthread-stubs/libpthread-stubs.la
> @@ -0,0 +1,41 @@
> +# libpthread-stubs.la - a libtool library file
> +# Generated by ltmain.sh (GNU libtool) 2.2.6 Debian-2.2.6a-4
> +#
> +# Please DO NOT delete this file!
> +# It is necessary for linking the library.
> +
> +# The name that we can dlopen(3).
> +dlname=''
> +
> +# Names of this library.
> +library_names='libc.so'
> +
> +# The name of the static archive.
> +old_library=''
> +
> +# Linker flags that can not go in dependency_libs.
> +inherited_linker_flags=''
> +
> +# Libraries that this one depends upon.
> +dependency_libs=''
> +
> +# Names of additional weak libraries provided by this library
> +weak_library_names=''
> +
> +# Version information for libpthread-stubs.
> +current=0
> +age=0
> +revision=0
> +
> +# Is this an already installed library?
> +installed=yes
> +
> +# Should we warn about portability when linking against -modules?
> +shouldnotlink=no
> +
> +# Files to dlopen/dlpreopen
> +dlopen=''
> +dlpreopen=''
> +
> +# Directory that this library needs to be installed in:
> +libdir='/usr/lib'
> _______________________________________________


I hope it is OK now. Only needs some if, then, fi into INSTALL.
I hope this fake .la file with library_names='libc.so' doesn't break
something else. Please test.

--
Ladislav Hagara




Archive powered by MHonArc 2.6.24.

Top of Page