* [gentoo-commits] gentoo-x86 commit in app-arch/zpaq/files: 0001-Add-autotools-files.patch
@ 2011-01-04 23:19 Michal Gorny (mgorny)
0 siblings, 0 replies; 2+ messages in thread
From: Michal Gorny (mgorny) @ 2011-01-04 23:19 UTC (permalink / raw
To: gentoo-commits
mgorny 11/01/04 23:19:48
Added: 0001-Add-autotools-files.patch
Log:
Importing zpaq archiver from Sunrise as per bug #278021. The ebuild was updated to install latest libzpaq & zpaq. It also patches in an autotools-based build system to avoid build difficulties.
(Portage version: 2.2.0_alpha12_p8/cvs/Linux x86_64)
Revision Changes Path
1.1 app-arch/zpaq/files/0001-Add-autotools-files.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/zpaq/files/0001-Add-autotools-files.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/zpaq/files/0001-Add-autotools-files.patch?rev=1.1&content-type=text/plain
Index: 0001-Add-autotools-files.patch
===================================================================
From 518123ca0f682ec617c2bab16bdb953380b5352c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Tue, 4 Jan 2011 21:04:53 +0100
Subject: [PATCH] Add autotools files.
---
Makefile.am | 22 ++++++++++++++++++++++
configure.ac | 28 ++++++++++++++++++++++++++++
2 files changed, 50 insertions(+), 0 deletions(-)
create mode 100644 Makefile.am
create mode 100644 configure.ac
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..3c71e01
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,22 @@
+bin_PROGRAMS = zpaq
+lib_LIBRARIES = libzpaq.a libzpaqstub.a
+include_HEADERS = libzpaq.h
+
+if HAVE_POD2MAN
+man1_MANS = zpaq.1
+
+zpaq.1: zpaq.1.pod
+ $(POD2MAN) $< > $@
+endif
+
+libzpaq_a_SOURCES = libzpaq.cpp libzpaqo.cpp libzpaq.h
+libzpaqstub_a_SOURCES = libzpaq.cpp zpaq.cpp libzpaq.h
+
+zpaq_SOURCES = zpaq.cpp libzpaq.h
+zpaq_LDADD = libzpaq.a
+zpaq_CPPFLAGS = $(AM_CPPFLAGS) -DOPT='"$(CXX) $(CXXFLAGS) zpaqopt.cpp $(LDFLAGS) @RUNTIME_LDFLAGS@ -o zpaqopt.exe -lzpaqstub"'
+
+AM_CPPFLAGS = -DNDEBUG
+
+MOSTLYCLEANFILES = zpaq.1
+EXTRA_DIST = zpaq.1.pod libzpaq.txt
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..d3565e2
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,28 @@
+AC_PREREQ([2.60])
+AC_INIT([zpaq], [2.04])
+AC_CONFIG_AUX_DIR([build-aux])
+AM_INIT_AUTOMAKE([1.6 foreign no-dependencies])
+
+AC_LANG([C++])
+AC_PROG_CXX
+AC_PROG_RANLIB
+
+runtime_LDFLAGS='-Wl,--strip-all'
+AC_MSG_CHECKING([whether the linker supports $runtime_LDFLAGS])
+save_LDFLAGS=$LDFLAGS
+LDFLAGS="$LDFLAGS $runtime_LDFLAGS"
+AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM([], [])],
+ [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])
+runtime_LDFLAGS=])
+LDFLAGS=$save_LDFLAGS
+AC_SUBST([RUNTIME_LDFLAGS], [$runtime_LDFLAGS])
+
+AC_CHECK_PROG([POD2MAN], [pod2man], [pod2man])
+AM_CONDITIONAL([HAVE_POD2MAN], [test x"$POD2MAN" != x""])
+AS_IF([test "x$POD2MAN" = x], [
+ AC_MSG_WARN([Unable to find pod2man, manpage will not be generated])
+])
+
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
--
1.7.3.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-arch/zpaq/files: 0001-Add-autotools-files.patch
@ 2011-01-05 16:10 Michal Gorny (mgorny)
0 siblings, 0 replies; 2+ messages in thread
From: Michal Gorny (mgorny) @ 2011-01-05 16:10 UTC (permalink / raw
To: gentoo-commits
mgorny 11/01/05 16:10:07
Modified: 0001-Add-autotools-files.patch
Log:
Make zpaq ebuild depend on libzpaq.
(Portage version: 2.2.0_alpha12_p8/cvs/Linux x86_64)
Revision Changes Path
1.2 app-arch/zpaq/files/0001-Add-autotools-files.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/zpaq/files/0001-Add-autotools-files.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/zpaq/files/0001-Add-autotools-files.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/zpaq/files/0001-Add-autotools-files.patch?r1=1.1&r2=1.2
Index: 0001-Add-autotools-files.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-arch/zpaq/files/0001-Add-autotools-files.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0001-Add-autotools-files.patch 4 Jan 2011 23:19:48 -0000 1.1
+++ 0001-Add-autotools-files.patch 5 Jan 2011 16:10:07 -0000 1.2
@@ -1,24 +1,23 @@
-From 518123ca0f682ec617c2bab16bdb953380b5352c Mon Sep 17 00:00:00 2001
+From e1d785c3f47252beab63242408a575fe64bc3e52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Tue, 4 Jan 2011 21:04:53 +0100
Subject: [PATCH] Add autotools files.
---
- Makefile.am | 22 ++++++++++++++++++++++
- configure.ac | 28 ++++++++++++++++++++++++++++
+ Makefile.am | 19 +++++++++++++++++++
+ configure.ac | 31 +++++++++++++++++++++++++++++++
2 files changed, 50 insertions(+), 0 deletions(-)
create mode 100644 Makefile.am
create mode 100644 configure.ac
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
-index 0000000..3c71e01
+index 0000000..1fc781a
--- /dev/null
+++ b/Makefile.am
-@@ -0,0 +1,22 @@
+@@ -0,0 +1,19 @@
+bin_PROGRAMS = zpaq
-+lib_LIBRARIES = libzpaq.a libzpaqstub.a
-+include_HEADERS = libzpaq.h
++lib_LIBRARIES = libzpaqstub.a
+
+if HAVE_POD2MAN
+man1_MANS = zpaq.1
@@ -27,23 +26,21 @@
+ $(POD2MAN) $< > $@
+endif
+
-+libzpaq_a_SOURCES = libzpaq.cpp libzpaqo.cpp libzpaq.h
-+libzpaqstub_a_SOURCES = libzpaq.cpp zpaq.cpp libzpaq.h
++libzpaqstub_a_SOURCES = zpaq.cpp
+
+zpaq_SOURCES = zpaq.cpp libzpaq.h
-+zpaq_LDADD = libzpaq.a
-+zpaq_CPPFLAGS = $(AM_CPPFLAGS) -DOPT='"$(CXX) $(CXXFLAGS) zpaqopt.cpp $(LDFLAGS) @RUNTIME_LDFLAGS@ -o zpaqopt.exe -lzpaqstub"'
++zpaq_CPPFLAGS = $(AM_CPPFLAGS) -DOPT='"$(CXX) $(CXXFLAGS) zpaqopt.cpp $(LDFLAGS) @RUNTIME_LDFLAGS@ -o zpaqopt.exe $(LIBS) -lzpaqstub"'
+
+AM_CPPFLAGS = -DNDEBUG
+
+MOSTLYCLEANFILES = zpaq.1
-+EXTRA_DIST = zpaq.1.pod libzpaq.txt
++EXTRA_DIST = zpaq.1.pod
diff --git a/configure.ac b/configure.ac
new file mode 100644
-index 0000000..d3565e2
+index 0000000..ae211d7
--- /dev/null
+++ b/configure.ac
-@@ -0,0 +1,28 @@
+@@ -0,0 +1,31 @@
+AC_PREREQ([2.60])
+AC_INIT([zpaq], [2.04])
+AC_CONFIG_AUX_DIR([build-aux])
@@ -53,6 +50,9 @@
+AC_PROG_CXX
+AC_PROG_RANLIB
+
++AC_CHECK_LIB([zpaq], [main],,
++ [AC_MSG_ERROR([Unable to find libzpaq, please install it before zpaq])])
++
+runtime_LDFLAGS='-Wl,--strip-all'
+AC_MSG_CHECKING([whether the linker supports $runtime_LDFLAGS])
+save_LDFLAGS=$LDFLAGS
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-01-05 16:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-05 16:10 [gentoo-commits] gentoo-x86 commit in app-arch/zpaq/files: 0001-Add-autotools-files.patch Michal Gorny (mgorny)
-- strict thread matches above, loose matches on Subject: below --
2011-01-04 23:19 Michal Gorny (mgorny)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox