Hello community, here is the log from the commit of package libsocketcan for openSUSE:Factory checked in at 2013-01-02 12:59:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libsocketcan (Old) and /work/SRC/openSUSE:Factory/.libsocketcan.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libsocketcan", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-12-21 01:49:00.356010756 +0100 +++ /work/SRC/openSUSE:Factory/.libsocketcan.new/libsocketcan.changes 2013-01-02 12:59:32.000000000 +0100 @@ -0,0 +1,4 @@ +------------------------------------------------------------------- +Sun Dec 30 07:06:29 UTC 2012 - [email protected] + +- Initial package (version 0.0.9) for build.opensuse.org New: ---- 0001-build-avoid-expansion-of-commented-macros.patch 0002-build-fix-bracket-imbalance.patch 0003-build-avoid-overriding-user-s-CFLAGS.patch libsocketcan-0.0.9.tar.xz libsocketcan.changes libsocketcan.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsocketcan.spec ++++++ # # spec file for package libsocketcan # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: libsocketcan %define lname libsocketcan2 Version: 0.0.9 Release: 0 Summary: Library for SocketCAN License: LGPL-2.1+ Group: Development/Libraries/C and C++ Url: http://pengutronix.de/software/libsocketcan/download/ #Git-Clone: git://git.pengutronix.de/git/tools/libsocketcan Source: %name-%version.tar.xz Patch1: 0001-build-avoid-expansion-of-commented-macros.patch Patch2: 0002-build-fix-bracket-imbalance.patch Patch3: 0003-build-avoid-overriding-user-s-CFLAGS.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf >= 2.59 BuildRequires: automake BuildRequires: libtool >= 2 BuildRequires: pkgconfig BuildRequires: xz %description This library allows you to control some basic functions in socketcan from userspace. A recent kernel with integrated SocketCAN (at least 2.6.30) is needed. %package -n %lname Summary: Library for Near Field Communication Group: System/Libraries %description -n %lname This library allows you to control some basic functions in socketcan from userspace. A recent kernel with integrated SocketCAN (at least 2.6.30) is needed. %package devel Summary: Development files for the Near Field Communications library Group: Development/Libraries/C and C++ Requires: %lname = %version %description devel This library allows you to control some basic functions in socketcan from userspace. A recent kernel with integrated SocketCAN (at least 2.6.30) is needed. This package contains the libsocketcan development files. %prep %setup -q %patch -P 1 -P 2 -P 3 -p1 %build ./autogen.sh; %configure --disable-static --docdir="%_docdir/%name" make %{?_smp_mflags}; %install b="%buildroot"; make install DESTDIR="$b"; rm -f "$b/%_libdir"/*.la; %post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig %files -n %lname %defattr(-,root,root) %_libdir/libsocketcan.so.* %files devel %defattr(-,root,root) %_includedir/can_netlink.h %_includedir/libsocketcan.h %_libdir/libsocketcan.so %_libdir/pkgconfig/libsocketcan.pc %_docdir/%name %changelog ++++++ 0001-build-avoid-expansion-of-commented-macros.patch ++++++ >From 77bcac4b583cf71149a76a7a4ad950ccec3e0d1d Mon Sep 17 00:00:00 2001 From: Jan Engelhardt <[email protected]> Date: Sun, 30 Dec 2012 08:12:59 +0100 Subject: [PATCH 1/3] build: avoid expansion of commented macros '#' does not ignore the line at the m4 level, "dnl" does. Signed-off-by: Jan Engelhardt <[email protected]> --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 3e4e048..1f17ce2 100644 --- a/configure.ac +++ b/configure.ac @@ -31,13 +31,13 @@ AC_SUBST(LT_AGE) # Checks for programs. # AC_PROG_CC -#AM_MISSING_PROG(PERL, perl, $missing_dir) +dnl AM_MISSING_PROG(PERL, perl, $missing_dir) # libtool, old: AC_LIBTOOL_WIN32_DLL -#AC_LIBTOOL_TAGS([]) +dnl AC_LIBTOOL_TAGS([]) AC_PROG_LIBTOOL # libtool, new: -# LT_INIT(win32-dll) +dnl LT_INIT(win32-dll) AM_INIT_AUTOMAKE([foreign no-exeext dist-bzip2]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes]])) -- 1.7.10.4 ++++++ 0002-build-fix-bracket-imbalance.patch ++++++ >From dd24e9c0e8750d02b2a2c269756452eafb96d59b Mon Sep 17 00:00:00 2001 From: Jan Engelhardt <[email protected]> Date: Sun, 30 Dec 2012 08:13:42 +0100 Subject: [PATCH 2/3] build: fix bracket imbalance Signed-off-by: Jan Engelhardt <[email protected]> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 1f17ce2..fb9253b 100644 --- a/configure.ac +++ b/configure.ac @@ -40,7 +40,7 @@ AC_PROG_LIBTOOL dnl LT_INIT(win32-dll) AM_INIT_AUTOMAKE([foreign no-exeext dist-bzip2]) -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes]])) +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) # -- 1.7.10.4 ++++++ 0003-build-avoid-overriding-user-s-CFLAGS.patch ++++++ >From ac258ff2403e43a3b29bedea117fa6b2e22c84a0 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt <[email protected]> Date: Sun, 30 Dec 2012 08:16:30 +0100 Subject: [PATCH 3/3] build: avoid overriding user's CFLAGS When attempting to `./configure CFLAGS=-O3`, -O2 is still taking precedence. CFLAGS *must* *not* be touched - this is a user variable. This patch fixes that. Signed-off-by: Jan Engelhardt <[email protected]> --- configure.ac | 7 ++++--- src/GNUmakefile.am | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index fb9253b..f60a06d 100644 --- a/configure.ac +++ b/configure.ac @@ -10,7 +10,7 @@ AC_CONFIG_AUX_DIR([config/autoconf]) AC_CANONICAL_BUILD AC_CANONICAL_HOST -CFLAGS="${CFLAGS} -Wall" +my_CFLAGS="-Wall" # # libtool library versioning stuff @@ -99,11 +99,12 @@ AC_ARG_ENABLE(debug, [CONFIG_DEBUG=no]) AC_MSG_RESULT([${CONFIG_DEBUG}]) if test "${CONFIG_DEBUG}" = "yes"; then - CFLAGS="${CFLAGS} -Werror -Wsign-compare -Wfloat-equal -Wformat-security -g -O1" + my_CFLAGS="$my_CFLAGS -Werror -Wsign-compare -Wfloat-equal -Wformat-security -g -O1" AC_DEFINE(DEBUG, 1, [debugging]) else - CFLAGS="${CFLAGS} -O2" + my_CFLAGS="$my_CFLAGS -O2" fi +AC_SUBST([my_CFLAGS]) AC_CONFIG_FILES([ diff --git a/src/GNUmakefile.am b/src/GNUmakefile.am index 1709bbe..32ff3a1 100644 --- a/src/GNUmakefile.am +++ b/src/GNUmakefile.am @@ -1,5 +1,6 @@ lib_LTLIBRARIES = libsocketcan.la +AM_CFLAGS = ${my_CFLAGS} AM_CPPFLAGS = \ -I$(top_srcdir)/include \ -I$(top_builddir)/include -- 1.7.10.4 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
