[gentoo-commits] gentoo-x86 commit in net-libs/axtls/files: explicit-libdir-r1.patch

[Michal Gorny (mgorny)]

mgorny  14/06/14 21:45:52

  Added:explicit-libdir-r1.patch
  Log:
  Enable multilib support, needed for net-misc/curl.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 
EFB4464E!)

Revision  ChangesPath
1.1  net-libs/axtls/files/explicit-libdir-r1.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/axtls/files/explicit-libdir-r1.patch?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/axtls/files/explicit-libdir-r1.patch?rev=1.1&content-type=text/plain

Index: explicit-libdir-r1.patch
===
>From 51c1e48d3f55da25adff306b891ad258eca35a8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= 
Date: Sat, 14 Jun 2014 23:35:42 +0200
Subject: [PATCH] Respect libdir.

---
 Makefile | 14 +-
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 036a29e..10a1649 100644
--- a/Makefile
+++ b/Makefile
@@ -60,6 +60,8 @@ ifdef CONFIG_SAMPLES
$(MAKE) -C samples
 endif
 
+LIBDIR = $(PREFIX)/lib
+
 $(STAGE) : ssl/version.h
@mkdir -p $(STAGE)
 
@@ -67,8 +69,10 @@ $(STAGE) : ssl/version.h
 ssl/version.h:
@echo "#define AXTLS_VERSION\"(no version)\"" > ssl/version.h
 
+$(LIBDIR) :
+   @mkdir -p $(LIBDIR)
+
 $(PREFIX) :
-   @mkdir -p $(PREFIX)/lib
@mkdir -p $(PREFIX)/bin
 
 release:
@@ -88,9 +92,9 @@ win32_demo:
@echo "#define AXTLS_VERSION\"$(VERSION)\"" > ssl/version.h
$(MAKE) win32releaseconf
 
-install: $(PREFIX) all
-   cp --no-dereference $(STAGE)/libax* $(PREFIX)/lib
-   chmod 755 $(PREFIX)/lib/libax* 
+install: $(LIBDIR) $(PREFIX) all
+   cp --no-dereference $(STAGE)/libax* $(LIBDIR)
+   chmod 755 $(LIBDIR)/libax* 
 ifdef CONFIG_SAMPLES
install -m 755 $(STAGE)/ax* $(PREFIX)/bin 
 endif
@@ -112,7 +116,7 @@ endif
install -m 644 config/config.h $(PREFIX)/include/axTLS
 
 installclean:
-   -@rm $(PREFIX)/lib/libax* > /dev/null 2>&1
+   -@rm $(LIBDIR)/libax* > /dev/null 2>&1
-@rm $(PREFIX)/bin/ax* > /dev/null 2>&1
-@rm $(PREFIX)/bin/axhttpd* > /dev/null 2>&1
-@rm `perl -e 'use Config; print $$Config{installarchlib};'`/axtlsp.pm 
> /dev/null 2>&1
-- 
2.0.0

[gentoo-commits] gentoo-x86 commit in net-libs/axtls/files: explicit-libdir-r1.patch

[Anthony G. Basile (blueness)]

blueness15/05/10 11:53:30

  Modified: explicit-libdir-r1.patch
  Log:
  Fix bug #534614.
  
  (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 
0xF52D4BBA)

Revision  ChangesPath
1.2  net-libs/axtls/files/explicit-libdir-r1.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/axtls/files/explicit-libdir-r1.patch?rev=1.2&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/axtls/files/explicit-libdir-r1.patch?rev=1.2&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/axtls/files/explicit-libdir-r1.patch?r1=1.1&r2=1.2

Index: explicit-libdir-r1.patch
===
RCS file: 
/var/cvsroot/gentoo-x86/net-libs/axtls/files/explicit-libdir-r1.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- explicit-libdir-r1.patch14 Jun 2014 21:45:52 -  1.1
+++ explicit-libdir-r1.patch10 May 2015 11:53:30 -  1.2
@@ -24,7 +24,7 @@
  ssl/version.h:
@echo "#define AXTLS_VERSION\"(no version)\"" > ssl/version.h
  
-+$(LIBDIR) :
++$(LIBDIR) : $(PREFIX)
 +  @mkdir -p $(LIBDIR)
 +
  $(PREFIX) :