summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Timo Gurr <tgurr@exherbo.org> 2017-05-26 12:58:08 +0200
committerAvatar Timo Gurr <tgurr@exherbo.org> 2017-05-26 13:03:30 +0200
commitce62b271f0cee430b8a9f42efab4c2882b27ab9c (patch)
tree7d983d71b97897cbd6e0e5ad14549624ec7185e2
parent15390fda9e6f8e50d58620e38c829b6bfa1daf5d (diff)
downloadhardware-ce62b271f0cee430b8a9f42efab4c2882b27ab9c.tar.gz
hardware-ce62b271f0cee430b8a9f42efab4c2882b27ab9c.tar.xz
libsmbios: version bump to 2.3.3
Change-Id: Ia197f0923e2ca57f741bb5156f3371b64785f4c4 Reviewed-on: https://galileo.mailstation.de/gerrit/9143 Reviewed-by: Jenkins <wk@mailstation.de> Reviewed-by: Timo Gurr <tgurr@exherbo.org>
-rw-r--r--packages/sys-apps/libsmbios/files/libsmbios-2.2.28-cppunit-tests.patch14
-rw-r--r--packages/sys-apps/libsmbios/files/libsmbios-2.3.3-doxygen_target.patch23
-rw-r--r--packages/sys-apps/libsmbios/files/libsmbios-fix-pie.patch33
-rw-r--r--packages/sys-apps/libsmbios/libsmbios-2.2.28.exheres-051
-rw-r--r--packages/sys-apps/libsmbios/libsmbios-2.3.3.exheres-073
5 files changed, 143 insertions, 51 deletions
diff --git a/packages/sys-apps/libsmbios/files/libsmbios-2.2.28-cppunit-tests.patch b/packages/sys-apps/libsmbios/files/libsmbios-2.2.28-cppunit-tests.patch
new file mode 100644
index 0000000..a69536d
--- /dev/null
+++ b/packages/sys-apps/libsmbios/files/libsmbios-2.2.28-cppunit-tests.patch
@@ -0,0 +1,14 @@
+Source: Gentoo
+Upsteam: Unknown
+Reason: Compile fix
+
+--- libsmbios-2.2.28/src/libsmbios_c/smi/smi_linux.c
++++ libsmbios-2.2.28/src/libsmbios_c/smi/smi_linux.c
+@@ -48,6 +48,7 @@
+ #define bufsize 256
+
+ // not in header file. for private use by unit tests.
++LIBSMBIOS_C_DLL_SPEC void set_basedir(const char *); // needed to link tests
+ void set_basedir(const char *newdir)
+ {
+ sysfs_basedir = newdir;
diff --git a/packages/sys-apps/libsmbios/files/libsmbios-2.3.3-doxygen_target.patch b/packages/sys-apps/libsmbios/files/libsmbios-2.3.3-doxygen_target.patch
new file mode 100644
index 0000000..28b6b8c
--- /dev/null
+++ b/packages/sys-apps/libsmbios/files/libsmbios-2.3.3-doxygen_target.patch
@@ -0,0 +1,23 @@
+Source: Gentoo
+Upsteam: Unknown
+Reason: Compile fix
+
+--- libsmbios-2.3.3/Makefile.am
++++ libsmbios-2.3.3/Makefile.am
+@@ -89,13 +89,15 @@
+
+
+ ########## DOCS ################
+-all: doxygen
+ if HAVE_DOXYGEN
++all: doxygen
+ DOXYGEN_DEPS=out/libsmbios_c/html/index.html
+ if BUILD_LIBSMBIOS_CXX
+ DOXYGEN_DEPS+=out/libsmbios_c++/html/index.html
+ endif
+ doxygen: $(DOXYGEN_DEPS)
++else
++all:
+ endif
+
+ DOT=@DOT@
diff --git a/packages/sys-apps/libsmbios/files/libsmbios-fix-pie.patch b/packages/sys-apps/libsmbios/files/libsmbios-fix-pie.patch
new file mode 100644
index 0000000..6b29a59
--- /dev/null
+++ b/packages/sys-apps/libsmbios/files/libsmbios-fix-pie.patch
@@ -0,0 +1,33 @@
+Source: Gentoo
+Upsteam: Unknown
+Reason: Compile fix
+
+--- libsmbios-2.2.19/src/bin/dellMediaDirectCtl.cpp
++++ libsmbios-2.2.19/src/bin/dellMediaDirectCtl.cpp
+@@ -183,16 +183,21 @@
+ {
+ iopl(3);
+
++ u32 tmpebx;
+ __asm__ __volatile__ (
+- // magic port
+- "outb %%al, %%dx \n\t"
+-
++ "movl %%ebx,%[tmpebx]\n\t"
++ "movl %[ebx],%%ebx\n\t"
++ // magic port
++ "outb %%al, %%dx \n\t"
++ "movl %%ebx,%[ebx]\n\t"
++ "movl %[tmpebx],%%ebx\n\t"
+ : /* output args */
+ "=a" (r->eax),
+- "=b" (r->ebx),
++ [ebx] "=rm" (r->ebx),
+ "=c" (r->ecx),
+ "=S" (r->esi),
+- "=D" (r->edi)
++ "=D" (r->edi),
++ [tmpebx] "+m" (tmpebx)
+ : /* input args */
+ "0" (r->eax),
+ "1" (r->ebx),
diff --git a/packages/sys-apps/libsmbios/libsmbios-2.2.28.exheres-0 b/packages/sys-apps/libsmbios/libsmbios-2.2.28.exheres-0
deleted file mode 100644
index 0642da5..0000000
--- a/packages/sys-apps/libsmbios/libsmbios-2.2.28.exheres-0
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2010 Paul Seidler
-# Distributed under the terms of the GNU General Public License v2
-
-SUMMARY="Provide access to SMBIOS information"
-DESCRIPTION="The libsmbios project aims towards providing access to as much BIOS information as
-possible. It does this by providing a library of functions that can be used as well as sample
-binaries."
-HOMEPAGE="http://linux.dell.com/libsmbios/main/index.html"
-DOWNLOADS="http://linux.dell.com/${PN}/download/${PN}/${PNV}/${PNV}.tar.bz2"
-
-LICENCES="GPL-2"
-SLOT="0"
-PLATFORMS="~amd64"
-MYOPTIONS="doc
- python [[ description = [ Build and install python utilities ] ]]
-"
-
-DEPENDENCIES="
- build:
- virtual/pkg-config[>=0.9.0]
- sys-devel/gettext[>=0.14]
- doc? (
- app-doc/doxygen
- media-gfx/graphviz
- )
- build+run:
- dev-libs/libxml2:2.0
- python? ( dev-lang/python:*[>=2.3] )
- test:
- dev-cpp/cppunit
-"
-
-# needs pyunit
-RESTRICT="test"
-
-DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=( 'python' 'doc doxygen' 'doc graphviz' )
-
-src_install() {
- default
-
- edo rmdir \
- "${IMAGE}"/etc/yum/{pluginconf.d/,} \
- "${IMAGE}"/usr/lib/yum-plugins/ \
- "${IMAGE}"/usr/{bin/,include/,lib/}
- option !python && \
- edo rmdir \
- "${IMAGE}"/etc/{libsmbios/,} \
- "${IMAGE}"/libsmbios_c/ \
- "${IMAGE}"/usr/share/smbios-utils/
-}
-
diff --git a/packages/sys-apps/libsmbios/libsmbios-2.3.3.exheres-0 b/packages/sys-apps/libsmbios/libsmbios-2.3.3.exheres-0
new file mode 100644
index 0000000..677b9b5
--- /dev/null
+++ b/packages/sys-apps/libsmbios/libsmbios-2.3.3.exheres-0
@@ -0,0 +1,73 @@
+# Copyright 2010 Paul Seidler
+# Distributed under the terms of the GNU General Public License v2
+
+require github [ user=dell tag=v${PV} ] \
+ flag-o-matic \
+ autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 ] ]
+
+SUMMARY="Provide access to SMBIOS information"
+DESCRIPTION="
+The libsmbios project aims towards providing access to as much BIOS information as possible. It
+does this by providing a library of functions that can be used as well as sample binaries.
+"
+
+LICENCES="GPL-2"
+SLOT="0"
+PLATFORMS="~amd64"
+MYOPTIONS="
+ doc
+ python [[ description = [ Build and install python utilities ] ]]
+"
+
+# needs pyunit
+RESTRICT="test"
+
+DEPENDENCIES="
+ build:
+ sys-devel/gettext[>=0.14]
+ virtual/pkg-config[>=0.9.0]
+ doc? (
+ app-doc/doxygen
+ media-gfx/graphviz
+ )
+ build+run:
+ dev-libs/libxml2:2.0
+ python? ( dev-lang/python:*[>=2.3] )
+ test:
+ dev-cpp/cppunit
+"
+
+DEFAULT_SRC_PREPARE_PATCHES=(
+ "${FILES}"/${PN}-fix-pie.patch
+ "${FILES}"/${PN}-2.2.28-cppunit-tests.patch
+ "${FILES}"/${PN}-2.3.3-doxygen_target.patch
+)
+
+DEFAULT_SRC_CONFIGURE_PARAMS=(
+ --enable-nls
+ --disable-libsmbios_cxx
+ --disable-rpath
+ --disable-static
+)
+DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=(
+ 'python'
+ 'doc doxygen'
+ 'doc graphviz'
+)
+
+src_prepare() {
+ edo sed \
+ -e '/yum-plugin/d' \
+ -i Makefile.am
+
+ edo autopoint --force
+
+ autotools_src_prepare
+}
+
+src_configure() {
+ replace-flags -O3 -O2
+
+ default
+}
+