Hello community, here is the log from the commit of package librtas for openSUSE:Factory checked in at 2016-10-20 23:04:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/librtas (Old) and /work/SRC/openSUSE:Factory/.librtas.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "librtas" Changes: -------- --- /work/SRC/openSUSE:Factory/librtas/librtas-doc.changes 2016-07-09 09:20:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.librtas.new/librtas-doc.changes 2016-10-20 23:05:02.000000000 +0200 @@ -1,0 +2,13 @@ +Mon Oct 10 11:41:53 UTC 2016 - jloe...@suse.com + +- version update to 2.0.1 + * Fix endianess issue in errinjct rtas call + +- added patches: + * librtas.fix_doc_path.patch + +- removed patches: + * librtas.bug-985643_open_RTAS_error_facility.patch + * librtas-failedmagic.patch + +------------------------------------------------------------------- librtas.changes: same change Old: ---- librtas-2.0.0.tar.gz librtas-failedmagic.patch librtas.bug-985643_open_RTAS_error_facility.patch New: ---- librtas-2.0.1.tar.gz librtas.fix_doc_path.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ librtas-doc.spec ++++++ --- /var/tmp/diff_new_pack.IfnQPD/_old 2016-10-20 23:05:07.000000000 +0200 +++ /var/tmp/diff_new_pack.IfnQPD/_new 2016-10-20 23:05:07.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package librtas-doc # -# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -17,10 +17,13 @@ Name: librtas-doc -Version: 2.0.0 +Version: 2.0.1 Release: 0 +BuildRequires: autoconf +BuildRequires: automake BuildRequires: doxygen BuildRequires: fdupes +BuildRequires: libtool Summary: Documents for librtas License: LGPL-2.1+ Group: Documentation/Other @@ -28,16 +31,18 @@ ExclusiveArch: ppc ppc64 ppc64le Url: https://github.com/nfont/librtas Source0: librtas-%{version}.tar.gz -Patch: librtas-failedmagic.patch +Patch0: librtas.fix_doc_path.patch %description This package provides librtas documentation %prep %setup -n librtas-%{version} -%patch +%patch0 -p1 %build +./autogen.sh +%configure make CFLAGS="%optflags -fPIC -g -I $PWD/librtasevent_src" LIB_DIR="%{_libdir}" %{?_smp_mflags} %install ++++++ librtas.spec ++++++ --- /var/tmp/diff_new_pack.IfnQPD/_old 2016-10-20 23:05:07.000000000 +0200 +++ /var/tmp/diff_new_pack.IfnQPD/_new 2016-10-20 23:05:07.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package librtas # -# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -19,7 +19,7 @@ %define sover 2 Name: librtas -Version: 2.0.0 +Version: 2.0.1 Release: 0 Summary: Libraries to provide access to RTAS calls and RTAS events License: LGPL-2.1+ @@ -27,10 +27,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: ppc ppc64 ppc64le Url: https://github.com/nfont/librtas +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool Source0: %{name}-%{version}.tar.gz Source1: baselibs.conf -Patch: librtas-failedmagic.patch -Patch1: librtas.bug-985643_open_RTAS_error_facility.patch +Patch0: librtas.fix_doc_path.patch %description The librtas shared library provides userspace with an interface through @@ -45,6 +47,7 @@ %package devel Summary: Devel librtas files Group: Development/Libraries/C and C++ +BuildRequires: pkg-config Requires: %{name}%{sover} = %{version} %description devel @@ -74,10 +77,11 @@ %prep %setup -q -%patch -%patch1 -p1 +%patch0 -p1 %build +./autogen.sh +%configure make CFLAGS="%optflags -fPIC -g -I $PWD/librtasevent_src" LIB_DIR="%{_libdir}" %{?_smp_mflags} %install @@ -87,6 +91,7 @@ rm -rf %buildroot/%_docdir /sbin/ldconfig -n %buildroot%{_libdir} chmod -x %{buildroot}%{_libdir}/*.a +rm %{buildroot}/%{_libdir}/*.la %post -n %{name}%{sover} -p /sbin/ldconfig @@ -106,9 +111,11 @@ %{_includedir}/librtasevent.h %{_includedir}/librtasevent_v4.h %{_includedir}/librtasevent_v6.h +%{_libdir}/pkgconfig/*.pc %files devel-static %defattr(-,root,root) +%doc COPYING.LESSER %{_libdir}/librtas.a %{_libdir}/librtasevent.a ++++++ librtas-2.0.0.tar.gz -> librtas-2.0.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtas-2.0.0/.gitignore new/librtas-2.0.1/.gitignore --- old/librtas-2.0.0/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/librtas-2.0.1/.gitignore 2016-07-12 00:06:49.000000000 +0200 @@ -0,0 +1,82 @@ +# +# NOTE! Don't add files that are generated in specific +# subdirectories here. Add them in the ".gitignore" file +# in that subdirectory instead. +# +# NOTE! Please use 'git ls-files -i --exclude-standard' +# command after changing this file, to see if there are +# any tracked files which get ignored after the change. +# +# Normal rules +# +.* +*.o +*.o.* +*.a +*.s +*.so +*.so.dbg +*.mod.c +*.i +*.order +*.gz +*.bz2 +*.lzma +*.zip +*.lzo +*.patch +*.gcno + +# +# Build files +# +/aclocal.m4 +/autom4te.cache/ +/config/ +/config.log +/config.status +/configure +/Makefile +/Makefile.in +/librtas.spec +/librtas_src/Makefile +/librtas_src/Makefile.in +/librtasevent_src/Makefile +/librtasevent_src/Makefile.in + +# +# git files that we don't want to ignore even it they are dot-files +# +!.gitignore + +# +# Generated include files +# +include/config +include/linux/version.h +include/generated + +# stgit generated dirs +patches-* + +# quilt's files +patches +series + +# cscope files +cscope.* +ncscope.* + +# ctags +tags +TAGS + +# gnu global files +GPATH +GRTAGS +GSYMS +GTAGS + +*.orig +*~ +\#*# diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtas-2.0.0/Changelog new/librtas-2.0.1/Changelog --- old/librtas-2.0.0/Changelog 2016-04-06 05:03:56.000000000 +0200 +++ new/librtas-2.0.1/Changelog 2016-07-12 00:06:49.000000000 +0200 @@ -1,3 +1,80 @@ +Changelog for librtas-2.0.1 +======================================= +commit 7f841902eb50ca77c3aa884e3fd924c2bbd817ca +Author: Vasant Hegde <hegdevas...@linux.vnet.ibm.com> +Date: Mon Jun 13 09:33:57 2016 -0400 + + librtas: Fix endianess issue in errinjct rtas call + + Unlike other RTAS calls, first output parameter of "ibm,open-errinjct" + is "open token", not status value. + + With commit ee457b1c, we endedup calling be32toh twice for otoken and + didn't convert status from BE to host format. + + This patch fixes above issue. + + Fixes: ee457b1c (librtas: consolidate common actions in making a rtas call) + + Signed-off-by: Vasant Hegde <hegdevas...@linux.vnet.ibm.com> + Signed-off-by: Nathan Fontenot <nf...@linux.vnet.ibm.com> + Reviewed-by: Tyrel Datwyler <tyr...@linux.vnet.ibm.com> + +commit e6f35aaee6ad1d674a1b0498e7144340f4abe926 +Author: Michael Bringmann <m...@linux.vnet.ibm.com> +Date: Mon Jun 13 09:29:59 2016 -0400 + + librtas/configure.ac: Fix for builds on older distros + + Fix problem generating configure script / Makefile on platforms/distros + that have versions of 'automake' older than 1.11.1. + + Signed-off-by: Michael Bringmann <mwb@linux.vnelibrtas/configure.ac: Fix for + + Fix problem generating configure script / Makefile on platforms/distros + that have versions of 'automake' older than 1.11.1. + + Signed-off-by: Michael Bringmann <m...@linux.vnet.ibm.com> + Acked-by: Stewart Smith <stew...@linux.vnet.ibm.com> + +commit ac6330c17bcbc955b9cb13d7073d89d3d87a3a50 +Author: Nathan Fontenot <nf...@linux.vnet.ibm.com> +Date: Wed May 18 16:43:14 2016 -0400 + + Correcting to add files that should have been added as part of + commit e0582a6af7c33e867edca. + + Signed-off-by: Nathan Fontenot <nf...@linux.vnet.ibm.com> + +commit e0582a6af7c33e867edca882b28a1544d2ef08b4 +Author: Stewart Smith <stew...@linux.vnet.ibm.com> +Date: Wed May 11 13:26:51 2016 -0400 + + From: Signed-off-by: Stewart Smith <stew...@linux.vnet.ibm.com> + + Switch to modern autotools based build system + + The patch removes the custom Makefiles and replaces them with a modern + autotools based build system. + + In the process, several bugs are fixed and enhancements made: + - build dependencies are sorted out okay + - the makefiles are now much smaller + - make dist works + - make distcheck works + - out of source builds work + - autogenerating of version in spec file is much simpler + - configure script checks for needed functions, header files and types + - we now build with hardening gcc flags (if available) + - libraries are now properly .so versioned + - build+install is good for multiarch + - some rpmlint warnings fixed + - split rpm into librtas and librtas-devel + - provide pkg-config foo + + Signed-off-by: Stewart Smith <stew...@linux.vnet.ibm.com> + Signed-off-by: Nathan Fontenot <nf...@linux.vnet.ibm.com> + Changelog for librtas-2.0.0 ======================================= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtas-2.0.0/Makefile new/librtas-2.0.1/Makefile --- old/librtas-2.0.0/Makefile 2016-04-06 05:03:56.000000000 +0200 +++ new/librtas-2.0.1/Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,54 +0,0 @@ -# -# Makefile for librtas -# - -include rules.mk - -.SILENT: - -FILES = README COPYING.LESSER -SUBDIRS = librtas_src librtasevent_src - -TARBALL_FILES += $(FILES) doc/doxygen.rtas doc/doxygen.rtasevent Changelog - -all: - @$(foreach d,$(SUBDIRS), $(MAKE) -C $d;) - # Update spec file for build type - @sed "s|\@LIB_DIR\@|$(LIB_DIR)$(call is_lib64,librtas_src/librtas.so.$(VERSION))|g" $(SPECFILE_IN) > $(SPECFILE) - -install: - @$(call install_doc,$(FILES),$(DESTDIR)) - @$(foreach d,$(SUBDIRS), $(MAKE) -C $d install;) - -uninstall: - @$(call uninstall_doc,$(FILES),$(DESTDIR)) - @$(foreach d,$(SUBDIRS), $(MAKE) -C $d uninstall;) - -rpm: all - @echo "Creating rpm..." - @export DESTDIR=$(SHIPDIR); $(MAKE) install - @rm $(SHIPDIR)$(LIB_DIR)$(call is_lib64,librtas_src/librtas.so.$(VERSION))/librtas.so - @rm $(SHIPDIR)$(LIB_DIR)$(call is_lib64,librtasevent_src/librtasevent.so.$(VERSION))/librtasevent.so - @$(RPM) -bb $(SPECFILE) - @rm -rf $(SHIPDIR) - -docs: - @echo "Creating doxygen documents..." - @mkdir -p doc/librtasevent - @mkdir -p doc/librtas - @$(DOXYGEN) doc/doxygen.rtas - @$(DOXYGEN) doc/doxygen.rtasevent - -tarball: clean - @echo "Creating release tarball..." - @$(BUILD_TARBALL) - -devball: clean - @echo "Creating snapshot tarball..." - @$(BUILD_DEVBALL) - -clean: - @$(foreach d,$(SUBDIRS), $(MAKE) -C $d clean;) - @echo "Cleaning up doxygen files..." - @rm -rf doc/librtas doc/librtasevent - @$(CLEAN) $(SHIPDIR) $(TARBALL) $(DEVBALL) $(SPECFILE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtas-2.0.0/Makefile.am new/librtas-2.0.1/Makefile.am --- old/librtas-2.0.0/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ new/librtas-2.0.1/Makefile.am 2016-07-12 00:06:49.000000000 +0200 @@ -0,0 +1,58 @@ +ACLOCAL_AMFLAGS = -I m4 + +EXTRA_DIST = README COPYING.LESSER +EXTRA_DIST += doc/doxygen.rtas doc/doxygen.rtasevent Changelog + +docdir = $(datadir)/doc/@PACKAGE@ +doc_DATA = README COPYING.LESSER + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = librtas.pc + +bin_PROGRAMS= +lib_LTLIBRARIES= +man_MANS= +noinst_HEADERS= +library_include_HEADERS= + +AM_CFLAGS = -I$(top_srcdir)/librtas_src/ -I$(top_srcdir)/librtasevent_src/ + +library_includedir=$(includedir) + +LIBRTAS_LIBRARY_VERSION = 2:0:0 + +lib_LTLIBRARIES += librtas.la +librtas_la_LDFLAGS = -version-info $(LIBRTAS_LIBRARY_VERSION) +librtas_la_SOURCES = \ + librtas_src/ofdt.c \ + librtas_src/syscall_calls.c \ + librtas_src/syscall_rmo.c + +library_include_HEADERS += librtas_src/librtas.h +noinst_HEADERS += librtas_src/syscall.h + +lib_LTLIBRARIES += librtasevent.la +librtasevent_la_LDFLAGS = -version-info $(LIBRTAS_LIBRARY_VERSION) +librtasevent_la_SOURCES = \ + librtasevent_src/get_rtas_event.c \ + librtasevent_src/print_rtas_event.c \ + librtasevent_src/rtas_cpu.c \ + librtasevent_src/rtas_dump.c \ + librtasevent_src/rtas_epow.c \ + librtasevent_src/rtas_io.c \ + librtasevent_src/rtas_lri.c \ + librtasevent_src/rtas_mem.c \ + librtasevent_src/rtas_post.c \ + librtasevent_src/rtas_sp.c \ + librtasevent_src/rtas_srcfru.c \ + librtasevent_src/rtas_v6_misc.c \ + librtasevent_src/rtas_vend.c \ + librtasevent_src/rtas_hotplug.c + +library_include_HEADERS += \ + librtasevent_src/librtasevent.h \ + librtasevent_src/librtasevent_v4.h \ + librtasevent_src/librtasevent_v6.h + +noinst_HEADERS += librtasevent_src/rtas_event.h \ + librtasevent_src/rtas_src_codes.c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtas-2.0.0/autogen.sh new/librtas-2.0.1/autogen.sh --- old/librtas-2.0.0/autogen.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/librtas-2.0.1/autogen.sh 2016-07-12 00:06:49.000000000 +0200 @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e + +if [ ! -d config ]; +then + mkdir config; +fi + +autoreconf --install --verbose --force diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtas-2.0.0/configure.ac new/librtas-2.0.1/configure.ac --- old/librtas-2.0.0/configure.ac 1970-01-01 01:00:00.000000000 +0100 +++ new/librtas-2.0.1/configure.ac 2016-07-12 00:06:49.000000000 +0200 @@ -0,0 +1,47 @@ +AC_INIT([librtas],[2.0.1],[See README]) + +AC_CONFIG_AUX_DIR([config]) +AC_CONFIG_MACRO_DIR([m4]) + +AC_CANONICAL_TARGET + +AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability subdir-objects foreign tar-ustar]) + +m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) + +AC_CONFIG_HEADERS([config.h]) + +PKG_PROG_PKG_CONFIG +AC_CHECK_FUNCS([memset munmap strrchr]) +AC_CHECK_HEADERS([fcntl.h]) +AC_C_INLINE +AC_FUNC_MALLOC +AC_FUNC_MMAP +AC_FUNC_REALLOC +AC_TYPE_OFF_T +AC_TYPE_SIZE_T +AC_TYPE_UID_T +AC_TYPE_UINT32_T +AC_TYPE_UINT64_T + +AC_DEFUN([LOCAL_CHECK_FLAGS],[ + AC_REQUIRE([AX_CHECK_LINK_FLAG]) + AC_REQUIRE([AX_APPEND_COMPILE_FLAGS]) + AC_LANG_PUSH([C]) + AX_APPEND_COMPILE_FLAGS([-Wall]) + AX_APPEND_COMPILE_FLAGS([-D_FORTIFY_SOURCE=2 -fstack-protector-all]) + AX_APPEND_COMPILE_FLAGS([-fwrapv -fPIE -Wstack-protector]) + AX_APPEND_COMPILE_FLAGS([--param=ssp-buffer-size=1]) + AX_CHECK_LINK_FLAG([-z relro -z now]) + AX_CHECK_LINK_FLAG([-pie]) + AC_LANG_POP +]) +LOCAL_CHECK_FLAGS + +LT_INIT +LT_LANG([C]) + +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + +AC_CONFIG_FILES([Makefile librtas.pc librtas.spec]) +AC_OUTPUT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtas-2.0.0/librtas.pc.in new/librtas-2.0.1/librtas.pc.in --- old/librtas-2.0.0/librtas.pc.in 1970-01-01 01:00:00.000000000 +0100 +++ new/librtas-2.0.1/librtas.pc.in 2016-07-12 00:06:49.000000000 +0200 @@ -0,0 +1,10 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: librtas +Description: The librtas package provides an interface for Run-Time Abstraction Services (RTAS) calls on PAPR platforms. The libraries allow users to examine and manipulate hardware, and parse RTAS events. +Version: @PACKAGE_VERSION@ +Libs: -L${libdir} -lrtas-2.0 -lofdt-2.0 -lrtasevent-2.0 +Cflags: -I${includedir}/librtas-2.0 -I${libdir}/librtas-2.0/include diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtas-2.0.0/librtas.spec.in new/librtas-2.0.1/librtas.spec.in --- old/librtas-2.0.0/librtas.spec.in 2016-04-06 05:03:56.000000000 +0200 +++ new/librtas-2.0.1/librtas.spec.in 2016-07-12 00:06:49.000000000 +0200 @@ -1,5 +1,5 @@ %define name librtas -%define version 2.0.0 +%define version @PACKAGE_VERSION@ %define sover 2 %define release 1 Summary: Libraries to provide access to RTAS calls and RTAS events. @@ -14,7 +14,7 @@ %description -The librtas shared library provides userspace with an interface +The librtas shared library provides user space with an interface through which certain RTAS calls can be made. The library uses either of the RTAS User Module or the RTAS system call to direct the kernel in making these calls. @@ -44,6 +44,7 @@ %setup -q %build +%configure %{__make} %{?_smp_mflags} %install @@ -64,6 +65,8 @@ %{_libdir}/librtas.so.%{version} %{_libdir}/librtasevent.so.%{version} %{_libdir}/librtasevent.so.%{sover} +%{_libdir}/librtas.la +%{_libdir}/librtasevent.la %files devel %{_libdir}/librtas.so @@ -72,6 +75,7 @@ %{_includedir}/librtasevent.h %{_includedir}/librtasevent_v4.h %{_includedir}/librtasevent_v6.h +%{_libdir}/pkgconfig/librtas.pc %files static %{_libdir}/librtas.a diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtas-2.0.0/librtas_src/Makefile new/librtas-2.0.1/librtas_src/Makefile --- old/librtas-2.0.0/librtas_src/Makefile 2016-04-06 05:03:56.000000000 +0200 +++ new/librtas-2.0.1/librtas_src/Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,60 +0,0 @@ -# -# Makefile for librtas -# -# Copyright (C) 2005 IBM Corporation -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -include ../rules.mk - -LIBRTAS_SONAME = librtas.so -LIBRTAS_STATIC = librtas.a -LIBRTAS = $(LIBRTAS_SONAME).$(VERSION) - -LIBRTAS_OBJS = ofdt.o syscall_calls.o syscall_rmo.o - -LIBRTAS_HDR = librtas.h -HEADERS = $(LIBRTAS_HDR) - -CFLAGS += -fPIC -DPIC -LDFLAGS += -shared -Wl,-soname -Wl,$(LIBRTAS_SONAME).$(MAJOR_NO) - -all: librtas_shared librtas_static - -librtas_shared: $(LIBRTAS_OBJS) $(HEADERS) - @echo "LD $(WORK_DIR)/$(LIBRTAS)..." - @$(CC) $(LIBRTAS_OBJS) $(LDFLAGS) -o $(LIBRTAS) - -librtas_static: $(LIBRTAS_OBJS) $(HEADERS) - @echo "AR $(LIBRTAS_STATIC)..." - @ar rcs $(LIBRTAS_STATIC) $(LIBRTAS_OBJS) - -install: - @$(call install_lib,$(LIBRTAS),$(DESTDIR)) - @$(call install_lib,$(LIBRTAS_STATIC),$(DESTDIR)) - @$(call install_inc,$(HEADERS),$(DESTDIR)) - @ln -sf $(LIBRTAS) $(DESTDIR)/$(LIB_DIR)$(call is_lib64,$(LIBRTAS))/$(LIBRTAS_SONAME) - @ln -sf $(LIBRTAS) $(DESTDIR)/$(LIB_DIR)$(call is_lib64,$(LIBRTAS))/$(LIBRTAS_SONAME).$(MAJOR_NO) - -uninstall: - @$(call uninstall_lib,$(LIBRTAS),$(DESTDIR)) - @$(call uninstall_lib,$(LIBRTAS_STATIC),$(DESTDIR)) - @$(call uninstall_inc,$(HEADERS),$(DESTDIR)) - @rm -f $(DESTDIR)/$(LIB_DIR)$(call is_lib64,$(LIBRTAS))/$(LIBRTAS_SONAME) - @rm -f $(DESTDIR)/$(LIB_DIR)$(call is_lib64,$(LIBRTAS))/$(LIBRTAS_SONAME).$(MAJOR_NO) - -clean: - @echo "Cleaning up $(WORK_DIR) files..." - @rm -f $(LIBRTAS_OBJS) $(LIBRTAS) $(LIBRTAS_STATIC) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtas-2.0.0/librtas_src/syscall_calls.c new/librtas-2.0.1/librtas_src/syscall_calls.c --- old/librtas-2.0.0/librtas_src/syscall_calls.c 2016-04-06 05:03:56.000000000 +0200 +++ new/librtas-2.0.1/librtas_src/syscall_calls.c 2016-07-12 00:06:49.000000000 +0200 @@ -466,15 +466,20 @@ */ int rtas_errinjct_open(int *otoken) { - __be32 be_otoken; + __be32 be_status; int rc, status; rc = sanity_check(); if (rc) return rc; - rc = rtas_call("ibm,open-errinjct", 0, 2, &be_otoken, &status); - *otoken = be32toh(be_otoken); + /* + * Unlike other RTAS calls, here first output parameter is otoken, + * not status. rtas_call converts otoken to host endianess. We + * have to convert status parameter. + */ + rc = rtas_call("ibm,open-errinjct", 0, 2, otoken, &be_status); + status = be32toh(be_status); dbg("(%p) = %d, %d\n", otoken, rc ? rc : status, *otoken); return rc ? rc : status; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtas-2.0.0/librtasevent_src/Makefile new/librtas-2.0.1/librtasevent_src/Makefile --- old/librtas-2.0.0/librtasevent_src/Makefile 2016-04-06 05:03:56.000000000 +0200 +++ new/librtas-2.0.1/librtasevent_src/Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,63 +0,0 @@ -# -# Makefile for librtasevent_src -# -# Copyright (C) 2005 IBM Corporation -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -include ../rules.mk - -LIBRE_SONAME = librtasevent.so -LIBRE_STATIC = librtasevent.a -LIBRE = $(LIBRE_SONAME).$(VERSION) - -LIBRE_OBJS = get_rtas_event.o print_rtas_event.o rtas_cpu.o rtas_dump.o \ - rtas_epow.o rtas_io.o rtas_lri.o rtas_mem.o rtas_post.o \ - rtas_sp.o rtas_srcfru.o rtas_v6_misc.o rtas_vend.o rtas_hotplug.o - -LIBRE_HDRS = librtasevent.h librtasevent_v4.h librtasevent_v6.h -HEADERS = $(LIBRE_HDRS) rtas_event.h - -CFLAGS += -fPIC -DPIC -I. -LDFLAGS += -shared -Wl,-soname -Wl,$(LIBRE_SONAME).$(MAJOR_NO) - -all: libre_shared libre_static - -libre_shared: $(LIBRE_OBJS) $(HEADERS) - @echo "LD librtasevent_src/$(LIBRE)..." - @$(CC) $(LIBRE_OBJS) $(LDFLAGS) -o $(LIBRE) - -libre_static: $(LIBRE_OBJS) $(HEADERS) - @echo "AR $(LIBRE_STATIC)..." - @ar rcs $(LIBRE_STATIC) $(LIBRE_OBJS) - -install: - @$(call install_lib,$(LIBRE),$(DESTDIR)) - @$(call install_lib,$(LIBRE_STATIC),$(DESTDIR)) - @$(call install_inc,$(LIBRE_HDRS),$(DESTDIR)) - @ln -sf $(LIBRE) $(DESTDIR)/$(LIB_DIR)$(call is_lib64,$(LIBRE))/$(LIBRE_SONAME) - @ln -sf $(LIBRE) $(DESTDIR)/$(LIB_DIR)$(call is_lib64,$(LIBRE))/$(LIBRE_SONAME).$(MAJOR_NO) - -uninstall: - @$(call uninstall_lib,$(LIBRE),$(DESTDIR)) - @$(call uninstall_lib,$(LIBRE_STATIC),$(DESTDIR)) - @$(call uninstall_inc,$(LIBRE_HDRS),$(DESTDIR)) - @rm -f $(DESTDIR)/$(LIB_DIR)$(call is_lib64,$(LIBRE))/$(LIBRE_SONAME) - @rm -f $(DESTDIR)/$(LIB_DIR)$(call is_lib64,$(LIBRE))/$(LIBRE_SONAME).$(MAJOR_NO) - -clean: - @echo "Cleaning up $(WORK_DIR) files..." - @rm -f $(LIBRE_OBJS) $(LIBRE_SONAME) $(LIBRE) $(LIBRE_STATIC) - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtas-2.0.0/m4/ax_append_compile_flags.m4 new/librtas-2.0.1/m4/ax_append_compile_flags.m4 --- old/librtas-2.0.0/m4/ax_append_compile_flags.m4 1970-01-01 01:00:00.000000000 +0100 +++ new/librtas-2.0.1/m4/ax_append_compile_flags.m4 2016-07-12 00:06:49.000000000 +0200 @@ -0,0 +1,65 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_append_compile_flags.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_APPEND_COMPILE_FLAGS([FLAG1 FLAG2 ...], [FLAGS-VARIABLE], [EXTRA-FLAGS]) +# +# DESCRIPTION +# +# For every FLAG1, FLAG2 it is checked whether the compiler works with the +# flag. If it does, the flag is added FLAGS-VARIABLE +# +# If FLAGS-VARIABLE is not specified, the current language's flags (e.g. +# CFLAGS) is used. During the check the flag is always added to the +# current language's flags. +# +# If EXTRA-FLAGS is defined, it is added to the current language's default +# flags (e.g. CFLAGS) when the check is done. The check is thus made with +# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to +# force the compiler to issue an error when a bad flag is given. +# +# NOTE: This macro depends on the AX_APPEND_FLAG and +# AX_CHECK_COMPILE_FLAG. Please keep this macro in sync with +# AX_APPEND_LINK_FLAGS. +# +# LICENSE +# +# Copyright (c) 2011 Maarten Bosmans <mkbosm...@gmail.com> +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see <http://www.gnu.org/licenses/>. +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 4 + +AC_DEFUN([AX_APPEND_COMPILE_FLAGS], +[AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG]) +AX_REQUIRE_DEFINED([AX_APPEND_FLAG]) +for flag in $1; do + AX_CHECK_COMPILE_FLAG([$flag], [AX_APPEND_FLAG([$flag], [$2])], [], [$3]) +done +])dnl AX_APPEND_COMPILE_FLAGS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtas-2.0.0/m4/ax_append_flag.m4 new/librtas-2.0.1/m4/ax_append_flag.m4 --- old/librtas-2.0.0/m4/ax_append_flag.m4 1970-01-01 01:00:00.000000000 +0100 +++ new/librtas-2.0.1/m4/ax_append_flag.m4 2016-07-12 00:06:49.000000000 +0200 @@ -0,0 +1,69 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_append_flag.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_APPEND_FLAG(FLAG, [FLAGS-VARIABLE]) +# +# DESCRIPTION +# +# FLAG is appended to the FLAGS-VARIABLE shell variable, with a space +# added in between. +# +# If FLAGS-VARIABLE is not specified, the current language's flags (e.g. +# CFLAGS) is used. FLAGS-VARIABLE is not changed if it already contains +# FLAG. If FLAGS-VARIABLE is unset in the shell, it is set to exactly +# FLAG. +# +# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim <gui...@gmx.de> +# Copyright (c) 2011 Maarten Bosmans <mkbosm...@gmail.com> +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see <http://www.gnu.org/licenses/>. +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 2 + +AC_DEFUN([AX_APPEND_FLAG], +[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX +AS_VAR_PUSHDEF([FLAGS], [m4_default($2,_AC_LANG_PREFIX[FLAGS])])dnl +AS_VAR_SET_IF(FLAGS, + [case " AS_VAR_GET(FLAGS) " in + *" $1 "*) + AC_RUN_LOG([: FLAGS already contains $1]) + ;; + *) + AC_RUN_LOG([: FLAGS="$FLAGS $1"]) + AS_VAR_SET(FLAGS, ["AS_VAR_GET(FLAGS) $1"]) + ;; + esac], + [AS_VAR_SET(FLAGS,["$1"])]) +AS_VAR_POPDEF([FLAGS])dnl +])dnl AX_APPEND_FLAG diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtas-2.0.0/m4/ax_check_compile_flag.m4 new/librtas-2.0.1/m4/ax_check_compile_flag.m4 --- old/librtas-2.0.0/m4/ax_check_compile_flag.m4 1970-01-01 01:00:00.000000000 +0100 +++ new/librtas-2.0.1/m4/ax_check_compile_flag.m4 2016-07-12 00:06:49.000000000 +0200 @@ -0,0 +1,74 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT]) +# +# DESCRIPTION +# +# Check whether the given FLAG works with the current language's compiler +# or gives an error. (Warnings, however, are ignored) +# +# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on +# success/failure. +# +# If EXTRA-FLAGS is defined, it is added to the current language's default +# flags (e.g. CFLAGS) when the check is done. The check is thus made with +# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to +# force the compiler to issue an error when a bad flag is given. +# +# INPUT gives an alternative input source to AC_COMPILE_IFELSE. +# +# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this +# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim <gui...@gmx.de> +# Copyright (c) 2011 Maarten Bosmans <mkbosm...@gmail.com> +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see <http://www.gnu.org/licenses/>. +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 3 + +AC_DEFUN([AX_CHECK_COMPILE_FLAG], +[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX +AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl +AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [ + ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS + _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1" + AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])], + [AS_VAR_SET(CACHEVAR,[yes])], + [AS_VAR_SET(CACHEVAR,[no])]) + _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags]) +AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes], + [m4_default([$2], :)], + [m4_default([$3], :)]) +AS_VAR_POPDEF([CACHEVAR])dnl +])dnl AX_CHECK_COMPILE_FLAGS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtas-2.0.0/m4/ax_check_link_flag.m4 new/librtas-2.0.1/m4/ax_check_link_flag.m4 --- old/librtas-2.0.0/m4/ax_check_link_flag.m4 1970-01-01 01:00:00.000000000 +0100 +++ new/librtas-2.0.1/m4/ax_check_link_flag.m4 2016-07-12 00:06:49.000000000 +0200 @@ -0,0 +1,73 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_check_link_flag.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_LINK_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT]) +# +# DESCRIPTION +# +# Check whether the given FLAG works with the linker or gives an error. +# (Warnings, however, are ignored) +# +# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on +# success/failure. +# +# If EXTRA-FLAGS is defined, it is added to the linker's default flags +# when the check is done. The check is thus made with the flags: "LDFLAGS +# EXTRA-FLAGS FLAG". This can for example be used to force the linker to +# issue an error when a bad flag is given. +# +# INPUT gives an alternative input source to AC_LINK_IFELSE. +# +# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this +# macro in sync with AX_CHECK_{PREPROC,COMPILE}_FLAG. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim <gui...@gmx.de> +# Copyright (c) 2011 Maarten Bosmans <mkbosm...@gmail.com> +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see <http://www.gnu.org/licenses/>. +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 3 + +AC_DEFUN([AX_CHECK_LINK_FLAG], +[AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_ldflags_$4_$1])dnl +AC_CACHE_CHECK([whether the linker accepts $1], CACHEVAR, [ + ax_check_save_flags=$LDFLAGS + LDFLAGS="$LDFLAGS $4 $1" + AC_LINK_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])], + [AS_VAR_SET(CACHEVAR,[yes])], + [AS_VAR_SET(CACHEVAR,[no])]) + LDFLAGS=$ax_check_save_flags]) +AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes], + [m4_default([$2], :)], + [m4_default([$3], :)]) +AS_VAR_POPDEF([CACHEVAR])dnl +])dnl AX_CHECK_LINK_FLAGS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtas-2.0.0/m4/ax_require_defined.m4 new/librtas-2.0.1/m4/ax_require_defined.m4 --- old/librtas-2.0.0/m4/ax_require_defined.m4 1970-01-01 01:00:00.000000000 +0100 +++ new/librtas-2.0.1/m4/ax_require_defined.m4 2016-07-12 00:06:49.000000000 +0200 @@ -0,0 +1,37 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_require_defined.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_REQUIRE_DEFINED(MACRO) +# +# DESCRIPTION +# +# AX_REQUIRE_DEFINED is a simple helper for making sure other macros have +# been defined and thus are available for use. This avoids random issues +# where a macro isn't expanded. Instead the configure script emits a +# non-fatal: +# +# ./configure: line 1673: AX_CFLAGS_WARN_ALL: command not found +# +# It's like AC_REQUIRE except it doesn't expand the required macro. +# +# Here's an example: +# +# AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG]) +# +# LICENSE +# +# Copyright (c) 2014 Mike Frysinger <vap...@gentoo.org> +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 1 + +AC_DEFUN([AX_REQUIRE_DEFINED], [dnl + m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file missing?])]) +])dnl AX_REQUIRE_DEFINED diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtas-2.0.0/m4/lib-pathname.m4 new/librtas-2.0.1/m4/lib-pathname.m4 --- old/librtas-2.0.0/m4/lib-pathname.m4 1970-01-01 01:00:00.000000000 +0100 +++ new/librtas-2.0.1/m4/lib-pathname.m4 2016-07-12 00:06:49.000000000 +0200 @@ -0,0 +1,62 @@ +dnl Determine the library path name. +dnl +dnl Red Hat systems and some other Linux systems use lib64 and lib32 rather +dnl than just lib in some circumstances. This file provides an Autoconf +dnl macro, RRA_SET_LDFLAGS, which given a variable, a prefix, and an optional +dnl suffix, adds -Lprefix/lib, -Lprefix/lib32, or -Lprefix/lib64 to the +dnl variable depending on which directories exist and the size of a long in +dnl the compilation environment. If a suffix is given, a slash and that +dnl suffix will be appended, to allow for adding a subdirectory of the library +dnl directory. +dnl +dnl This file also provides the Autoconf macro RRA_SET_LIBDIR, which sets the +dnl libdir variable to PREFIX/lib{,32,64} as appropriate. +dnl +dnl The canonical version of this file is maintained in the rra-c-util +dnl package, available at <http://www.eyrie.org/~eagle/software/rra-c-util/>. +dnl +dnl Written by Russ Allbery <ea...@eyrie.org> +dnl Copyright 2008, 2009 +dnl The Board of Trustees of the Leland Stanford Junior University +dnl +dnl This file is free software; the authors give unlimited permission to copy +dnl and/or distribute it, with or without modifications, as long as this +dnl notice is preserved. + +dnl Probe for the alternate library name that we should attempt on this +dnl architecture, given the size of an int, and set rra_lib_arch_name to that +dnl name. Separated out so that it can be AC_REQUIRE'd and not run multiple +dnl times. +dnl +dnl There is an unfortunate abstraction violation here where we assume we know +dnl the cache variable name used by Autoconf. Unfortunately, Autoconf doesn't +dnl provide any other way of getting at that information in shell that I can +dnl see. +AC_DEFUN([_RRA_LIB_ARCH_NAME], +[rra_lib_arch_name=lib + AC_CHECK_SIZEOF([long]) + AS_IF([test "$ac_cv_sizeof_long" -eq 4 && test -d /usr/lib32], + [rra_lib_arch_name=lib32], + [AS_IF([test "$ac_cv_sizeof_long" -eq 8 && test -d /usr/lib64], + [rra_lib_arch_name=lib64])])]) + +dnl Set VARIABLE to -LPREFIX/lib{,32,64} or -LPREFIX/lib{,32,64}/SUFFIX as +dnl appropriate. +AC_DEFUN([RRA_SET_LDFLAGS], +[AC_REQUIRE([_RRA_LIB_ARCH_NAME]) + AS_IF([test -d "$2/$rra_lib_arch_name"], + [AS_IF([test x"$3" = x], + [$1="[$]$1 -L$2/${rra_lib_arch_name}"], + [$1="[$]$1 -L$2/${rra_lib_arch_name}/$3"])], + [AS_IF([test x"$3" = x], + [$1="[$]$1 -L$2/lib"], + [$1="[$]$1 -L$2/lib/$3"])]) + $1=`echo "[$]$1" | sed -e 's/^ *//'`]) + +dnl Set libdir to PREFIX/lib{,32,64} as appropriate. +AC_DEFUN([RRA_SET_LIBDIR], +[AC_REQUIRE([_RRA_LIB_ARCH_NAME]) + AS_IF([test -d "$1/$rra_lib_arch_name"], + [libdir="$1/${rra_lib_arch_name}"], + [libdir="$1/lib"])]) + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtas-2.0.0/rules.mk new/librtas-2.0.1/rules.mk --- old/librtas-2.0.0/rules.mk 2016-04-06 05:03:56.000000000 +0200 +++ new/librtas-2.0.1/rules.mk 1970-01-01 01:00:00.000000000 +0100 @@ -1,216 +0,0 @@ -# -# Common Makefile definitions -# - -PWD = $(shell echo `pwd`) -INSTALL = /usr/bin/install - -DOXYGEN = `which doxygen` - -# Name of the rpm spec file -SPECFILENAME = librtas.spec -SPECFILENAME_IN = librtas.spec.in - -# resolves the root directory at which this build is occuring -ROOT_DIR = \ - $(shell \ - while [ `pwd` != "/" ]; \ - do \ - if [ -f `pwd`/$(SPECFILENAME_IN) ]; \ - then \ - echo `pwd`; \ - break; \ - fi; \ - cd ..; \ - done;) - -# Full path to the rpm specfile -SPECFILE = $(ROOT_DIR)/$(SPECFILENAME) -SPECFILE_IN = $(ROOT_DIR)/$(SPECFILENAME_IN) - -# Find the correct command to build RPM's -RPM = \ - $(shell \ - if [ -a /bin/rpmbuild ]; then \ - echo "/bin/rpmbuild"; \ - elif [ -a /usr/bin/rpmbuild ]; then \ - echo "/usr/bin/rpmbuild"; \ - elif [ -a /bin/rpm ]; then \ - echo "/bin/rpm"; \ - elif [ -a /usr/bin/rpm ]; then \ - echo "/usr/bin/rpmbuild"; \ - else \ - echo "rpm seems to be non-existant"; \ - fi;) - -# Pull the version, release and project name info from the spec file -VERSION := $(shell echo `grep "define version" $(SPECFILE_IN) | cut -d' ' -f3`) -RELEASE := $(shell echo `grep "define release" $(SPECFILE_IN) | cut -d' ' -f3`) -PROJECT := $(shell echo `grep "define name" $(SPECFILE_IN) | cut -d' ' -f3`) - -# Generate the Major, Minor and Revision numbers from the version -VERSION_LIST := $(subst ., ,$(VERSION)) -MAJOR_NO := $(word 1,$(VERSION_LIST)) -MINOR_NO := $(word 2,$(VERSION_LIST)) -REVISION_NO := $(word 3,$(VERSION_LIST)) - -# Set this if you want to install to a base directory other than / -DESTDIR ?= - -# Standard base directory names -BIN_DIR = /usr/bin -SBIN_DIR = /usr/sbin -LIB_DIR = /usr/lib -INC_DIR = /usr/include/ -DOC_DIR = /usr/share/doc/packages/$(PROJECT) -MAN_DIR = /usr/share/man/man8 - -# Shipdir is where we put all the files to build an rpm -SHIPDIR = /tmp/$(PROJECT)-buildroot - -# Source tarball name and build directory -TARBALL = $(PROJECT)-$(VERSION).tar.gz -TARBALL_FILES = Makefile rules.mk $(SPECFILENAME_IN) -TB_DIR = $(PROJECT)-$(VERSION) - -# Build a tarball of the source code -BUILD_TARBALL = \ - $(shell \ - echo CVS > ./ignore; \ - mkdir $(TB_DIR); \ - cp -R $(SUBDIRS) $(TARBALL_FILES) $(TB_DIR); \ - tar -zcf $(TARBALL) -X ./ignore $(TB_DIR); \ - rm -rf ./ignore $(TB_DIR);) - -# Development snapshot builds -DEVBALL = $(PROJECT)-$(VERSION)-`date +%Y%m%d`.tar.gz - -# Build a development snapshot of the source code -BUILD_DEVBALL = \ - $(shell \ - echo CVS > ./ignore; \ - mkdir $(TB_DIR); \ - cp -R $(SUBDIRS) $(TARBALL_FILES) $(TB_DIR); \ - tar -zcf $(DEVBALL) -X ./ignore $(TB_DIR); \ - rm -rf ./ignore $(TB_DIR);) - -# Current build directory -WORK_DIR = $(patsubst /%,%,$(subst $(ROOT_DIR),,$(PWD))) - -# You should always build with -Wall -CFLAGS += -Wall - -# Uncomment this for debug builds -CFLAGS += -g -DDEBUG - -# If you wish to have a log of installed files, define the file here -INSTALL_LOG ?= $(ROOT_DIR)/install.log - -# -# is_lib64 - determine if a library is 64-bit -# -# $1 library to examine -define is_lib64 -$(findstring 64,$(shell file $(firstword $1))) -endef - -# -# install_files - Install file(s) in the given location -# -# $1 - files to be installed -# $2 - permissions to install file with -# $3 - directory to install file to -define install_files - $(INSTALL) -d -m 755 $3; - $(foreach f,$1, \ - echo "Installing $(patsubst /%,%,$(WORK_DIR)/$f)"; \ - $(INSTALL) -m $2 $f $3; \ - $(if $(INSTALL_LOG),echo $3/$f >> $(INSTALL_LOG);,)) -endef - -# -# The following are wrappers for calls to install_files for -# installing files in known locations (i.e. /usr/bin). The args -# to each of the wrappers are the same. -# -# $1 - files to be installed -# $2 - prefix to install path for the files -# -define install_bin - $(call install_files,$1,755,$2/$(BIN_DIR)) -endef - -define install_sbin - $(call install_files,$1,744,$2/$(SBIN_DIR)) -endef - -define install_lib - $(call install_files,$1,755,$2/$(LIB_DIR)$(call is_lib64,$1)) -endef - -define install_inc - $(call install_files,$1,644,$2/$(INC_DIR)) -endef - -define install_doc - $(call install_files,$1,644,$2/$(DOC_DIR)) -endef - -define install_man - $(call install_files,$1,644,$2/$(MAN_DIR)) -endef - -# -# uninstall_files - Uninstall file(s) -# -# $1 - files to be uninstalled -# $2 - the directory the files to uninstall live in -define uninstall_files - $(foreach f,$1, \ - echo "Un-installing $(patsubst /%,%,$(WORK_DIR)/$f)"; \ - rm -f $2/$f;) -endef - -# -# The following are wrappers for calls to uninstall_files for -# removing files in known locations (i.e. /usr/bin). The args -# to each of the wrappers are the same. -# -# $1 - files to be uninstalled -# $2 - prefix to uninstall path for the files -# -define uninstall_bin - $(call uninstall_files,$1,$2/$(BIN_DIR)) -endef - -define uninstall_sbin - $(call uninstall_files,$1,$2/$(SBIN_DIR)) -endef - -define uninstall_lib - $(call uninstall_files,$1,$2/$(LIB_DIR)$(call is_lib64,$1)) -endef - -define uninstall_inc - $(call uninstall_files,$1,$2/$(INC_DIR)) -endef - -define uninstall_doc - $(call uninstall_files,$1,$2/$(DOC_DIR)) -endef - -define uninstall_man - $(call uninstall_files,$1,$2/$(MAN_DIR)) -endef - - -# Define "CLEAN" as rm plus any files defined in this file that -# the actual Makefile may not (or have to) know about -CLEAN = /bin/rm -rf $(INSTALL_LOG) $(TB_DIR) *~ - -# Default target for building object files -%.o: %.c - @echo "CC $(WORK_DIR)/$@" - @$(CC) -c $(CFLAGS) $< - - ++++++ librtas.fix_doc_path.patch ++++++ Index: librtas-2.0.1/Makefile.am =================================================================== --- librtas-2.0.1.orig/Makefile.am +++ librtas-2.0.1/Makefile.am @@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST = README COPYING.LESSER EXTRA_DIST += doc/doxygen.rtas doc/doxygen.rtasevent Changelog -docdir = $(datadir)/doc/@PACKAGE@ +docdir = $(datadir)/doc/packages/@PACKAGE@ doc_DATA = README COPYING.LESSER pkgconfigdir = $(libdir)/pkgconfig
