Browse Source

* changed udev to not build libvolume_id.so when doing an static build

git-svn-id: svn://svn.opensde.net/opensde/package/branches/udev@21354 10447126-35f2-4685-b0cf-6dd780d3921f
early
Alejandro Mery 18 years ago
parent
commit
a13748aedc
  1. 39
      filesystem/udev/no_libvolume_id_so.diff
  2. 17
      filesystem/udev/udev.conf

39
filesystem/udev/no_libvolume_id_so.diff

@ -0,0 +1,39 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../udev/no_libvolume_id_so.diff
# Copyright (C) 2007 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- ./extras/volume_id/lib/Makefile.orig 2007-06-14 13:00:06.000000000 -0400
+++ ./extras/volume_id/lib/Makefile 2007-06-14 13:01:51.000000000 -0400
@@ -59,7 +59,7 @@
libvolume_id.h \
util.h
-all: libvolume_id.a $(SHLIB) libvolume_id.pc
+all: libvolume_id.a libvolume_id.pc
.PHONY: all
.DEFAULT: all
@@ -103,10 +103,8 @@
install: all
$(INSTALL_DATA) -D libvolume_id.h $(DESTDIR)$(includedir)/libvolume_id.h
- $(INSTALL_LIB) -D $(SHLIB) $(DESTDIR)$(libdir)/$(SHLIB)
mkdir -p $(DESTDIR)$(usrlibdir)/
- ln -sf $(SHLIB) $(DESTDIR)$(libdir)/libvolume_id.so.$(SHLIB_CUR)
- ln -sf $(libdir)/$(SHLIB) $(DESTDIR)$(usrlibdir)/libvolume_id.so
+ $(INSTALL_LIB) -D libvolume_id.a $(DESTDIR)$(usrlibdir)/libvolume_id.a
$(INSTALL_DATA) -D libvolume_id.pc $(DESTDIR)$(usrlibdir)/pkgconfig/libvolume_id.pc
.PHONY: install

17
filesystem/udev/udev.conf

@ -41,8 +41,18 @@ udev_devices() {
add_flist "$1"
}
forced_mkfifo() {
local mode=
case "$1" in
-m) mode="$2"; shift; shift ;;
esac
mkfifo ${mode:+-m $mode} "$@"
add_flist "$1"
}
forced_mknod -m 0666 "$devdir/null" c 1 3
forced_mknod -m 0600 "$devdir/console" c 5 1
forced_mkfifo -m 0666 "$devdir/log"
}
udev_rules() {
@ -73,6 +83,13 @@ hook_add postmake 7 'udev_helpers'
var_append makeopt ' ' "LD=$CC"
var_append makeopt ' ' 'DEBUG=true'
if [ "$SDECFG_STATIC" == "1" ]; then
var_append makeopt ' ' "VOLUME_ID_STATIC=true"
var_append patchfiles ' ' "$confdir/no_libvolume_id_so.diff"
fi
# list of extra helpers to build and install
hook_add postpatch 5 "export extras=\$( ls -1d extras/* | grep -v '\.sh' | tr '\n' ' ' )"
var_append makeopt ' ' 'EXTRAS="$extras"'

Loading…
Cancel
Save