| 1 |
mgorny 11/01/05 16:10:07 |
| 2 |
|
| 3 |
Modified: 0001-Add-autotools-files.patch |
| 4 |
Log: |
| 5 |
Make zpaq ebuild depend on libzpaq. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha12_p8/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 app-arch/zpaq/files/0001-Add-autotools-files.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/zpaq/files/0001-Add-autotools-files.patch?rev=1.2&view=markup |
| 13 |
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 |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/zpaq/files/0001-Add-autotools-files.patch?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: 0001-Add-autotools-files.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-arch/zpaq/files/0001-Add-autotools-files.patch,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- 0001-Add-autotools-files.patch 4 Jan 2011 23:19:48 -0000 1.1 |
| 23 |
+++ 0001-Add-autotools-files.patch 5 Jan 2011 16:10:07 -0000 1.2 |
| 24 |
@@ -1,24 +1,23 @@ |
| 25 |
-From 518123ca0f682ec617c2bab16bdb953380b5352c Mon Sep 17 00:00:00 2001 |
| 26 |
+From e1d785c3f47252beab63242408a575fe64bc3e52 Mon Sep 17 00:00:00 2001 |
| 27 |
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
| 28 |
Date: Tue, 4 Jan 2011 21:04:53 +0100 |
| 29 |
Subject: [PATCH] Add autotools files. |
| 30 |
|
| 31 |
--- |
| 32 |
- Makefile.am | 22 ++++++++++++++++++++++ |
| 33 |
- configure.ac | 28 ++++++++++++++++++++++++++++ |
| 34 |
+ Makefile.am | 19 +++++++++++++++++++ |
| 35 |
+ configure.ac | 31 +++++++++++++++++++++++++++++++ |
| 36 |
2 files changed, 50 insertions(+), 0 deletions(-) |
| 37 |
create mode 100644 Makefile.am |
| 38 |
create mode 100644 configure.ac |
| 39 |
|
| 40 |
diff --git a/Makefile.am b/Makefile.am |
| 41 |
new file mode 100644 |
| 42 |
-index 0000000..3c71e01 |
| 43 |
+index 0000000..1fc781a |
| 44 |
--- /dev/null |
| 45 |
+++ b/Makefile.am |
| 46 |
-@@ -0,0 +1,22 @@ |
| 47 |
+@@ -0,0 +1,19 @@ |
| 48 |
+bin_PROGRAMS = zpaq |
| 49 |
-+lib_LIBRARIES = libzpaq.a libzpaqstub.a |
| 50 |
-+include_HEADERS = libzpaq.h |
| 51 |
++lib_LIBRARIES = libzpaqstub.a |
| 52 |
+ |
| 53 |
+if HAVE_POD2MAN |
| 54 |
+man1_MANS = zpaq.1 |
| 55 |
@@ -27,23 +26,21 @@ |
| 56 |
+ $(POD2MAN) $< > $@ |
| 57 |
+endif |
| 58 |
+ |
| 59 |
-+libzpaq_a_SOURCES = libzpaq.cpp libzpaqo.cpp libzpaq.h |
| 60 |
-+libzpaqstub_a_SOURCES = libzpaq.cpp zpaq.cpp libzpaq.h |
| 61 |
++libzpaqstub_a_SOURCES = zpaq.cpp |
| 62 |
+ |
| 63 |
+zpaq_SOURCES = zpaq.cpp libzpaq.h |
| 64 |
-+zpaq_LDADD = libzpaq.a |
| 65 |
-+zpaq_CPPFLAGS = $(AM_CPPFLAGS) -DOPT='"$(CXX) $(CXXFLAGS) zpaqopt.cpp $(LDFLAGS) @RUNTIME_LDFLAGS@ -o zpaqopt.exe -lzpaqstub"' |
| 66 |
++zpaq_CPPFLAGS = $(AM_CPPFLAGS) -DOPT='"$(CXX) $(CXXFLAGS) zpaqopt.cpp $(LDFLAGS) @RUNTIME_LDFLAGS@ -o zpaqopt.exe $(LIBS) -lzpaqstub"' |
| 67 |
+ |
| 68 |
+AM_CPPFLAGS = -DNDEBUG |
| 69 |
+ |
| 70 |
+MOSTLYCLEANFILES = zpaq.1 |
| 71 |
-+EXTRA_DIST = zpaq.1.pod libzpaq.txt |
| 72 |
++EXTRA_DIST = zpaq.1.pod |
| 73 |
diff --git a/configure.ac b/configure.ac |
| 74 |
new file mode 100644 |
| 75 |
-index 0000000..d3565e2 |
| 76 |
+index 0000000..ae211d7 |
| 77 |
--- /dev/null |
| 78 |
+++ b/configure.ac |
| 79 |
-@@ -0,0 +1,28 @@ |
| 80 |
+@@ -0,0 +1,31 @@ |
| 81 |
+AC_PREREQ([2.60]) |
| 82 |
+AC_INIT([zpaq], [2.04]) |
| 83 |
+AC_CONFIG_AUX_DIR([build-aux]) |
| 84 |
@@ -53,6 +50,9 @@ |
| 85 |
+AC_PROG_CXX |
| 86 |
+AC_PROG_RANLIB |
| 87 |
+ |
| 88 |
++AC_CHECK_LIB([zpaq], [main],, |
| 89 |
++ [AC_MSG_ERROR([Unable to find libzpaq, please install it before zpaq])]) |
| 90 |
++ |
| 91 |
+runtime_LDFLAGS='-Wl,--strip-all' |
| 92 |
+AC_MSG_CHECKING([whether the linker supports $runtime_LDFLAGS]) |
| 93 |
+save_LDFLAGS=$LDFLAGS |
Archives