Hello community, here is the log from the commit of package libaal for openSUSE:Factory checked in at 2017-09-04 12:35:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libaal (Old) and /work/SRC/openSUSE:Factory/.libaal.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libaal" Mon Sep 4 12:35:54 2017 rev:6 rq:520346 version:1.0.6 Changes: -------- --- /work/SRC/openSUSE:Factory/libaal/libaal.changes 2014-09-12 15:25:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libaal.new/libaal.changes 2017-09-04 12:36:01.825977323 +0200 @@ -1,0 +2,7 @@ +Sat Sep 2 11:05:17 UTC 2017 - [email protected] + +- Add no-nonsense.diff to resolve build failure with glibc. +- Redo libaal-1.0.5-rpmoptflags.patch with p1. +- Drop static library subpackage. + +------------------------------------------------------------------- New: ---- no-nonsense.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libaal.spec ++++++ --- /var/tmp/diff_new_pack.GJqeQC/_old 2017-09-04 12:36:05.401474383 +0200 +++ /var/tmp/diff_new_pack.GJqeQC/_new 2017-09-04 12:36:05.409473258 +0200 @@ -1,7 +1,7 @@ # # spec file for package libaal # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,6 +26,7 @@ Source: http://downloads.sf.net/reiser4/libaal-%version.tar.gz Patch1: libaal-1.0.5-rpmoptflags.patch +Patch2: no-nonsense.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake @@ -60,25 +61,13 @@ %description devel libaal includes device abstraction, libc independence code, and more. -%package devel-static -Summary: Static libraries for libaal development -License: GPL-2.0 -Group: Development/Libraries/C and C++ -Requires: %name-devel = %version - -%description devel-static -libaal includes device abstraction, libc independence code, and more. - -This subpackage contains the static versions of the libraries, for -use with programs that require them. - %prep %setup -q -%patch -P 1 -p0 +%patch -P 1 -P 2 -p1 %build autoreconf -fi -%configure --enable-static --with-pic +%configure --disable-static make %{?_smp_mflags} %install @@ -106,8 +95,4 @@ %_includedir/aal %_datadir/aclocal -%files devel-static -%defattr(-,root,root) -%_libdir/libaal*.a - %changelog ++++++ libaal-1.0.5-rpmoptflags.patch ++++++ --- /var/tmp/diff_new_pack.GJqeQC/_old 2017-09-04 12:36:05.509459191 +0200 +++ /var/tmp/diff_new_pack.GJqeQC/_new 2017-09-04 12:36:05.521457503 +0200 @@ -1,6 +1,12 @@ ---- configure.in -+++ configure.in -@@ -126,7 +126,7 @@ +--- + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: libaal-1.0.6/configure.in +=================================================================== +--- libaal-1.0.6.orig/configure.in ++++ libaal-1.0.6/configure.in +@@ -126,7 +126,7 @@ else ALIGN_FLAGS="-malign-jumps=1 -malign-loops=1 -malign-functions=1" fi ++++++ no-nonsense.diff ++++++ Date: 2017-09-02 13:03:15.353403096 +0200 From: Jan Engelhardt <[email protected]> Stop redefining libc definitions that cause build failures under glibc-2.26. [ 46s] In file included from /usr/include/sys/types.h:156:0, [ 46s] from /usr/include/stdlib.h:279, [ 46s] from malloc.c:15: [ 46s] /usr/include/bits/stdint-intn.h:27:19: error: conflicting types for 'int64_t' [ 46s] typedef __int64_t int64_t; [ 46s] ^~~~~~~ [ 46s] In file included from ../include/aal/libaal.h:17:0, [ 46s] from malloc.c:6: [ 46s] ../include/aal/types.h:35:33: note: previous declaration of 'int64_t' was here [ 46s] typedef long long int int64_t; --- include/aal/types.h | 48 ++---------------------------------------------- 1 file changed, 2 insertions(+), 46 deletions(-) Index: libaal-1.0.6/include/aal/types.h =================================================================== --- libaal-1.0.6.orig/include/aal/types.h +++ libaal-1.0.6/include/aal/types.h @@ -26,24 +26,7 @@ #undef ESTRUCT #define ESTRUCT 50 -#ifndef __int8_t_defined -#define __int8_t_defined -typedef signed char int8_t; -typedef short int int16_t; -typedef int int32_t; -__extension__ -typedef long long int int64_t; -#endif - -typedef unsigned char uint8_t; -typedef unsigned short int uint16_t; -#ifndef __uint32_t_defined -#define __uint32_t_defined -typedef unsigned int uint32_t; -__extension__ -typedef unsigned long long int uint64_t; -#endif - +#include <stdint.h> #define MAX_UINT8 ((uint8_t)~0) #define MAX_UINT16 ((uint16_t)~0) #define MAX_UINT32 ((uint32_t)~0) @@ -53,36 +36,9 @@ typedef unsigned long long int uint64_t because we don't want use gcc builtins in minimal mode for achive as small binary size as possible. */ -#ifndef ENABLE_MINIMAL # include <stdarg.h> -#else -#ifndef _VA_LIST_ -#define _VA_LIST_ -typedef char *va_list; -#endif -#undef va_arg -#undef va_end -#undef va_start - -#define va_end(ap) \ - do {} while(0); - -#define va_start(ap, p) \ - (ap = (char *)(&(p)+1)) - -#define va_arg(ap, type) \ - ((type *)(ap += sizeof(type)))[-1] -#endif - -/* As libaal may be used without any standard headers, we need to declare NULL - macro here in order to avoid compilation errors. */ -#undef NULL -#if defined(__cplusplus) -# define NULL 0 -#else -# define NULL ((void *)0) -#endif +#include <stdio.h> /* Simple type for direction denoting */ enum aal_dir {
