commit bc675eb9674b507121d6cefb86c95987f951d4f3 Author: Thomas Penteker <tek@serverop.de> Date: Mon Oct 27 23:13:00 2014 +0100 tinyxml: fix sonames. Courtesy of Matt diff --git a/tinyxml/.footprint b/tinyxml/.footprint index 48eced4..eae6e67 100644 --- a/tinyxml/.footprint +++ b/tinyxml/.footprint @@ -3,7 +3,6 @@ drwxr-xr-x root/root usr/include/ -rw-r--r-- root/root usr/include/tinystr.h -rw-r--r-- root/root usr/include/tinyxml.h drwxr-xr-x root/root usr/lib/ --rw-r--r-- root/root usr/lib/libtinyxml.2.6.2.so -lrwxrwxrwx root/root usr/lib/libtinyxml.2.6.so -> libtinyxml.2.6.2.so -lrwxrwxrwx root/root usr/lib/libtinyxml.2.so -> libtinyxml.2.6.2.so -lrwxrwxrwx root/root usr/lib/libtinyxml.so -> libtinyxml.2.6.2.so +lrwxrwxrwx root/root usr/lib/libtinyxml.so -> libtinyxml.so.2.6.2 +lrwxrwxrwx root/root usr/lib/libtinyxml.so.2 -> libtinyxml.so.2.6.2 +-rwxr-xr-x root/root usr/lib/libtinyxml.so.2.6.2 diff --git a/tinyxml/.md5sum b/tinyxml/.md5sum index e7e5f9b..70df5f0 100644 --- a/tinyxml/.md5sum +++ b/tinyxml/.md5sum @@ -1,2 +1,3 @@ b6cc2d9330707373d920f760793c6311 entity.patch +f938588965814d5a916d4f1fdeec1e43 tinyxml-use-stl.patch 2a0aaf609c9e670ec9748cd01ed52dae tinyxml_2_6_2.zip diff --git a/tinyxml/Pkgfile b/tinyxml/Pkgfile index ea94219..51eedc6 100644 --- a/tinyxml/Pkgfile +++ b/tinyxml/Pkgfile @@ -1,27 +1,30 @@ -# Description: simple, small, C++ XML parser +# Description: A simple, small, minimal, C++ XML parser # URL: http://www.grinninglizard.com/tinyxml/ # Maintainer: Thomas Penteker, tek at serverop dot de -# Packager: Bartlomiej Palmowski, rotwang at crux dot org dot pl +# Packager: Matt Housh, jaeger at morpheus dot net name=tinyxml version=2.6.2 release=1 -source=( - http://download.sourceforge.net/project/$name/$name/$version/${name}_${version//./_}.zip - entity.patch -) +source=(http://download.sourceforge.net/project/$name/$name/$version/${name}_${version//./_}.zip \ + entity.patch $name-use-stl.patch) -shopt -s extglob build() { - soname=lib$name.$version.so - cd $name - patch -p0 -i ../entity.patch - mkdir -p $PKG/usr/include - install -m 0644 *.h $_ - g++ $CXXFLAGS -DTIXML_USE_STL -fPIC -shared -o $soname !(xmltest).cpp - install -D -m 0644 $soname $PKG/usr/lib/$soname - cd $PKG/usr/lib - ln -s $soname ${soname%%.*}.so - ln -s $soname ${soname%.*.*.so}.so - ln -s $soname ${soname%.*.so}.so + export CXXFLAGS="${CXXFLAGS} -fPIC" + cd $name + + patch -p0 -i $SRC/entity.patch + patch -p0 -i $SRC/$name-use-stl.patch + sed -i -e "/^TINYXML_USE_STL/ s/=.*/= YES/" \ + -e "/^RELEASE_CFLAGS/ s/-O3/${CXXFLAGS}/" Makefile + + make + g++ ${CXXFLAGS} -DTIXML_USE_STL -shared -o lib$name.so.$version \ + -Wl,-soname,lib$name.so.${version:0:1} *.o + + mkdir -p $PKG/usr/{include,lib} + install -m 0755 lib$name.so.$version $PKG/usr/lib/ + install -m 0644 *.h $PKG/usr/include/ + ln -s lib$name.so.$version $PKG/usr/lib/lib$name.so.${version:0:1} + ln -s lib$name.so.$version $PKG/usr/lib/lib$name.so }