From f634277131233d9a0d6f277cbd28c1d6599bb99a Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 28 Jun 2011 16:55:47 +0200 Subject: [PATCH] libgudev: split from udev, to avoid a cyclic dependency. --- srcpkgs/libgudev | 1 - srcpkgs/libgudev-devel | 2 +- srcpkgs/libgudev/depends | 1 + srcpkgs/libgudev/libgudev-devel.template | 20 ++++++++++ srcpkgs/libgudev/template | 49 ++++++++++++++++++++++++ srcpkgs/udev/libgudev-devel.template | 24 ------------ srcpkgs/udev/libgudev.template | 22 ----------- srcpkgs/udev/template | 3 +- 8 files changed, 72 insertions(+), 50 deletions(-) delete mode 120000 srcpkgs/libgudev create mode 120000 srcpkgs/libgudev/depends create mode 100644 srcpkgs/libgudev/libgudev-devel.template create mode 100644 srcpkgs/libgudev/template delete mode 100644 srcpkgs/udev/libgudev-devel.template delete mode 100644 srcpkgs/udev/libgudev.template diff --git a/srcpkgs/libgudev b/srcpkgs/libgudev deleted file mode 120000 index b95ad750c43..00000000000 --- a/srcpkgs/libgudev +++ /dev/null @@ -1 +0,0 @@ -udev \ No newline at end of file diff --git a/srcpkgs/libgudev-devel b/srcpkgs/libgudev-devel index b95ad750c43..5bd48a4071c 120000 --- a/srcpkgs/libgudev-devel +++ b/srcpkgs/libgudev-devel @@ -1 +1 @@ -udev \ No newline at end of file +libgudev \ No newline at end of file diff --git a/srcpkgs/libgudev/depends b/srcpkgs/libgudev/depends new file mode 120000 index 00000000000..a53336e027e --- /dev/null +++ b/srcpkgs/libgudev/depends @@ -0,0 +1 @@ +../udev/depends \ No newline at end of file diff --git a/srcpkgs/libgudev/libgudev-devel.template b/srcpkgs/libgudev/libgudev-devel.template new file mode 100644 index 00000000000..ad450728fc5 --- /dev/null +++ b/srcpkgs/libgudev/libgudev-devel.template @@ -0,0 +1,20 @@ +# Template file for 'libgudev-devel'. +# +short_desc="${short_desc} - development glib bindings" +long_desc="${long_desc} + + This package contains the libgudev development files (static libs, headers, + etc), a library to interact with udev through the GLib bindings." + +replaces="udev-glib-devel>=0" +Add_dependency run libudev-devel +Add_dependency run glib-devel +Add_dependency run libgudev + +do_install() +{ + mkdir -p ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr + mv ${SRCPKGDESTDIR}/usr/share ${DESTDIR}/usr + mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib +} diff --git a/srcpkgs/libgudev/template b/srcpkgs/libgudev/template new file mode 100644 index 00000000000..98e29c521e2 --- /dev/null +++ b/srcpkgs/libgudev/template @@ -0,0 +1,49 @@ +# Template file for 'libgudev' + +. ${XBPS_SRCPKGDIR}/udev/template +unset revision run_depends openrc_services conf_files subpackages +unset keep_empty_dirs post_install + +pkgname=libgudev +wrksrc="udev-${version}" +build_style=custom-install +short_desc="/dev/ and hotplug management daemon (glib bindings)" +long_desc=" + udev is a daemon which dynamically creates and removes device nodes from + /dev/, handles hotplug events and loads drivers at boot time. + + This package contains libgudev, a library to interact with udev through + the GLib bindings." + +subpackages="libgudev-devel" + +Add_dependency run glibc +Add_dependency run libudev +Add_dependency run glib +Add_dependency build gobject-introspection + +do_build() +{ + ./configure ${configure_args} --enable-introspection + make ${makejobs} +} + +do_install() +{ + make DESTDIR=${DESTDIR} install + + mkdir -p ${wrksrc}/tmp/lib ${wrksrc}/tmp/usr/lib/pkgconfig \ + ${wrksrc}/tmp/usr/share/gtk-doc/html ${wrksrc}/tmp/usr/include + + mv ${DESTDIR}/lib/libgudev* ${wrksrc}/tmp/lib + mv ${DESTDIR}/usr/lib/libgudev* ${wrksrc}/tmp/usr/lib + mv ${DESTDIR}/usr/lib/girepository* ${wrksrc}/tmp/usr/lib + mv ${DESTDIR}/usr/include/gudev* ${wrksrc}/tmp/usr/include + mv ${DESTDIR}/usr/lib/pkgconfig/gudev* \ + ${wrksrc}/tmp/usr/lib/pkgconfig + mv ${DESTDIR}/usr/share/gtk-doc/html/gudev \ + ${wrksrc}/tmp/usr/share/gtk-doc/html + mv ${DESTDIR}/usr/share/gir* ${wrksrc}/tmp/usr/share + rm -rf ${DESTDIR}/* + mv ${wrksrc}/tmp/* ${DESTDIR} +} diff --git a/srcpkgs/udev/libgudev-devel.template b/srcpkgs/udev/libgudev-devel.template deleted file mode 100644 index f6f3a9300ee..00000000000 --- a/srcpkgs/udev/libgudev-devel.template +++ /dev/null @@ -1,24 +0,0 @@ -# Template file for 'udev-glib-devel'. -# -short_desc="${short_desc} - development glib bindings" -long_desc="${long_desc} - - This package contains the libgudev development files (static libs, headers, - etc), a library to interact with udev through the GLib bindings." - -replaces="udev-glib-devel>=0" -Add_dependency run libudev-devel -Add_dependency run glib-devel -Add_dependency run libgudev - -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib ${DESTDIR}/usr/share/gtk-doc/html \ - ${DESTDIR}/usr/lib/pkgconfig - mv ${SRCPKGDESTDIR}/usr/include/gudev* ${DESTDIR}/usr/include - mv ${SRCPKGDESTDIR}/usr/share/gtk-doc/html/gudev \ - ${DESTDIR}/usr/share/gtk-doc/html - mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig/gudev* \ - ${DESTDIR}/usr/lib/pkgconfig - mv ${SRCPKGDESTDIR}/usr/share/gir-1.0 ${DESTDIR}/usr/share -} diff --git a/srcpkgs/udev/libgudev.template b/srcpkgs/udev/libgudev.template deleted file mode 100644 index 6f274a8a025..00000000000 --- a/srcpkgs/udev/libgudev.template +++ /dev/null @@ -1,22 +0,0 @@ -# Template file for 'udev-glib'. -# -short_desc="${short_desc} (glib bindings)" -long_desc="${long_desc} - - This package contains libgudev, a library to interact with udev through - the GLib bindings." - -revision=1 - -replaces="udev-glib>=0" -Add_dependency run glibc -Add_dependency run glib -Add_dependency run libudev - -do_install() -{ - mkdir -p ${DESTDIR}/lib ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/lib/libgudev* ${DESTDIR}/lib - mv ${SRCPKGDESTDIR}/usr/lib/libgudev* ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/girepository* ${DESTDIR}/usr/lib -} diff --git a/srcpkgs/udev/template b/srcpkgs/udev/template index be09a635231..443543b7fe9 100644 --- a/srcpkgs/udev/template +++ b/srcpkgs/udev/template @@ -5,7 +5,7 @@ revision=2 distfiles="${KERNEL_SITE}/utils/kernel/hotplug/udev-${version}.tar.bz2" build_style=gnu_configure configure_args="--sbindir=/sbin --without-selinux --libexecdir=/lib/udev ---with-rootlibdir=/lib --enable-introspection --enable-edd --enable-floppy +--with-rootlibdir=/lib --disable-introspection --enable-edd --enable-floppy --enable-action_modeswitch --with-systemdsystemunitdir=/lib/systemd/system" short_desc="/dev/ and hotplug management daemon" maintainer="Juan RP " @@ -36,7 +36,6 @@ Add_dependency build glib-devel Add_dependency build acl-devel Add_dependency build glib-devel Add_dependency build libusb-compat-devel -Add_dependency build gobject-introspection post_install() {