From 4113262ec1ec856ccaa131dc4b8875f3a5805d3a Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 15 Feb 2013 10:07:07 +0100 Subject: [PATCH] glib: split headers, static libs and pc files to a new subpkg "libglib-devel". --- srcpkgs/glib/glib-devel.template | 6 +----- srcpkgs/glib/libglib-devel.template | 12 ++++++++++++ srcpkgs/glib/template | 4 ++-- srcpkgs/libglib-devel | 1 + 4 files changed, 16 insertions(+), 7 deletions(-) create mode 100644 srcpkgs/glib/libglib-devel.template create mode 120000 srcpkgs/libglib-devel diff --git a/srcpkgs/glib/glib-devel.template b/srcpkgs/glib/glib-devel.template index de79273c10e..442e974358f 100644 --- a/srcpkgs/glib/glib-devel.template +++ b/srcpkgs/glib/glib-devel.template @@ -1,6 +1,6 @@ # Template file for 'glib-devel'. # -depends="zlib-devel pcre-devel libffi-devel perl glib-${version}_${revision}" +depends="python perl libglib-devel-${version}_${revision}" short_desc="${short_desc} -- development files" pycompile_dirs="usr/lib/gdbus-2.0/codegen" @@ -15,11 +15,7 @@ do_install() { [ "$(basename ${f})" = "glib-compile-schemas" ] && continue mv ${f} ${DESTDIR}/usr/bin done - vmove usr/include usr - vmove usr/lib/glib-2.0 usr/lib - vmove usr/lib/pkgconfig usr/lib vmove usr/lib/gdbus-2.0 usr/lib - vmove "usr/lib/*.a" usr/lib for f in gtk-doc aclocal glib-2.0 gdb; do vmove usr/share/${f} usr/share diff --git a/srcpkgs/glib/libglib-devel.template b/srcpkgs/glib/libglib-devel.template new file mode 100644 index 00000000000..13cbc9cd48e --- /dev/null +++ b/srcpkgs/glib/libglib-devel.template @@ -0,0 +1,12 @@ +# Template file for 'libglib-devel'. +# +depends="zlib-devel pcre-devel libffi-devel glib-${version}_${revision}" +short_desc="${short_desc} -- development files" +replaces="glib-devel<2.34.3_3" + +do_install() { + vmove usr/include usr + vmove usr/lib/glib-2.0 usr/lib + vmove usr/lib/pkgconfig usr/lib + vmove "usr/lib/*.a" usr/lib +} diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template index 338e0418707..03d44250a8b 100644 --- a/srcpkgs/glib/template +++ b/srcpkgs/glib/template @@ -1,8 +1,8 @@ # Template build file for 'glib' pkgname=glib version=2.34.3 -revision=2 -subpackages="glib-devel" +revision=3 +subpackages="libglib-devel glib-devel" build_style=gnu-configure configure_args="--disable-fam --with-pcre=system --enable-static --enable-man" diff --git a/srcpkgs/libglib-devel b/srcpkgs/libglib-devel new file mode 120000 index 00000000000..5ca6c3ba538 --- /dev/null +++ b/srcpkgs/libglib-devel @@ -0,0 +1 @@ +glib \ No newline at end of file