Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 304693 Details for
Bug 407497
sys-libs/zlib-1.2.6 on mingw32: two pkg-config files, bad pkg-config file, missing dll import lib
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
zlib-1.2.6-mingw32-destdir.patch
zlib-1.2.6-mingw32-destdir.patch (text/plain), 2.58 KB, created by
Nathan Phillip Brink (binki) (RETIRED)
on 2012-03-09 03:17:37 UTC
(
hide
)
Description:
zlib-1.2.6-mingw32-destdir.patch
Filename:
MIME Type:
Creator:
Nathan Phillip Brink (binki) (RETIRED)
Created:
2012-03-09 03:17:37 UTC
Size:
2.58 KB
patch
obsolete
>From c18afa8b7489fc6d1406f7026bfc420579b15005 Mon Sep 17 00:00:00 2001 >From: Nathan Phillip Brink <binki@gentoo.org> >Date: Fri, 9 Mar 2012 01:29:46 +0000 >Subject: [PATCH] Add DESTDIR support to mingw32 Makefile.gcc. > >--- > win32/Makefile.gcc | 30 +++++++++++++++--------------- > 1 files changed, 15 insertions(+), 15 deletions(-) > >diff --git a/win32/Makefile.gcc b/win32/Makefile.gcc >index c4a6589..55f3c1e 100644 >--- a/win32/Makefile.gcc >+++ b/win32/Makefile.gcc >@@ -123,20 +123,20 @@ zlibrc.o: win32/zlib1.rc > .PHONY: install uninstall clean > > install: zlib.h zconf.h $(STATICLIB) $(IMPLIB) >- @if test -z "$(INCLUDE_PATH)" -o -z "$(LIBRARY_PATH)" -o -z "$(BINARY_PATH)"; then \ >+ @if test -z "$(DESTDIR)$(INCLUDE_PATH)" -o -z "$(DESTDIR)$(LIBRARY_PATH)" -o -z "$(DESTDIR)$(BINARY_PATH)"; then \ > echo INCLUDE_PATH, LIBRARY_PATH, and BINARY_PATH must be specified; \ > exit 1; \ > fi >- -@mkdir -p $(INCLUDE_PATH) >- -@mkdir -p $(LIBRARY_PATH) $(LIBRARY_PATH)/pkgconfig >+ -@mkdir -p '$(DESTDIR)$(INCLUDE_PATH)' >+ -@mkdir -p '$(DESTDIR)$(LIBRARY_PATH)' '$(DESTDIR)$(LIBRARY_PATH)'/pkgconfig > -if [ "$(SHARED_MODE)" = "1" ]; then \ >- mkdir -p $(BINARY_PATH); \ >- $(INSTALL) $(SHAREDLIB) $(BINARY_PATH); \ >- $(INSTALL) $(IMPLIB) $(LIBRARY_PATH); \ >+ mkdir -p '$(DESTDIR)$(BINARY_PATH)'; \ >+ $(INSTALL) $(SHAREDLIB) '$(DESTDIR)$(BINARY_PATH)'; \ >+ $(INSTALL) $(IMPLIB) '$(DESTDIR)$(LIBRARY_PATH)'; \ > fi >- -$(INSTALL) zlib.h $(INCLUDE_PATH) >- -$(INSTALL) zconf.h $(INCLUDE_PATH) >- -$(INSTALL) $(STATICLIB) $(LIBRARY_PATH) >+ -$(INSTALL) zlib.h '$(DESTDIR)$(INCLUDE_PATH)' >+ -$(INSTALL) zconf.h '$(DESTDIR)$(INCLUDE_PATH)' >+ -$(INSTALL) $(STATICLIB) '$(DESTDIR)$(LIBRARY_PATH)' > sed \ > -e 's|@prefix@|${prefix}|g' \ > -e 's|@exec_prefix@|${exec_prefix}|g' \ >@@ -144,16 +144,16 @@ install: zlib.h zconf.h $(STATICLIB) $(IMPLIB) > -e 's|@sharedlibdir@|$(LIBRARY_PATH)|g' \ > -e 's|@includedir@|$(INCLUDE_PATH)|g' \ > -e 's|@VERSION@|'`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' zlib.h`'|g' \ >- zlib.pc.in > $(LIBRARY_PATH)/pkgconfig/zlib.pc >+ zlib.pc.in > '$(DESTDIR)$(LIBRARY_PATH)'/pkgconfig/zlib.pc > > uninstall: > -if [ "$(SHARED_MODE)" = "1" ]; then \ >- $(RM) $(BINARY_PATH)/$(SHAREDLIB); \ >- $(RM) $(LIBRARY_PATH)/$(IMPLIB); \ >+ $(RM) '$(DESTDIR)$(BINARY_PATH)'/$(SHAREDLIB); \ >+ $(RM) '$(DESTDIR)$(LIBRARY_PATH)'/$(IMPLIB); \ > fi >- -$(RM) $(INCLUDE_PATH)/zlib.h >- -$(RM) $(INCLUDE_PATH)/zconf.h >- -$(RM) $(LIBRARY_PATH)/$(STATICLIB) >+ -$(RM) '$(DESTDIR)$(INCLUDE_PATH)'/zlib.h >+ -$(RM) '$(DESTDIR)$(INCLUDE_PATH)'/zconf.h >+ -$(RM) '$(DESTDIR)$(LIBRARY_PATH)'/$(STATICLIB) > > clean: > -$(RM) $(STATICLIB) >-- >1.7.3.4 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 407497
:
304689
|
304691
| 304693