-
-
Notifications
You must be signed in to change notification settings - Fork 517
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
patch flint to fix handling of DESTDIR
- Loading branch information
1 parent
ae514f3
commit 03c764c
Showing
1 changed file
with
106 additions
and
0 deletions.
There are no files selected for viewing
106 changes: 106 additions & 0 deletions
106
build/pkgs/flint/patches/0001-Makefile.in-fix-handling-of-DESTDIR.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| From 54277f054f13254898c9a57c2c7eb869877e1252 Mon Sep 17 00:00:00 2001 | ||
| From: Marc Mezzarobba <[email protected]> | ||
| Date: Mon, 13 Nov 2023 10:23:54 +0100 | ||
| Subject: [PATCH] Makefile.in: fix handling of $DESTDIR | ||
|
|
||
| --- | ||
| Makefile.in | 54 ++++++++++++++++++++++++++--------------------------- | ||
| 1 file changed, 27 insertions(+), 27 deletions(-) | ||
|
|
||
| diff --git a/Makefile.in b/Makefile.in | ||
| index 08db6837c..2827b9da1 100644 | ||
| --- a/Makefile.in | ||
| +++ b/Makefile.in | ||
| @@ -34,9 +34,9 @@ FLINT_SOLIB:=@FLINT_SOLIB@ | ||
| prefix:=@prefix@ | ||
| exec_prefix:=@exec_prefix@ | ||
|
|
||
| -INCLUDEDIR:=$(DESTDIR)@includedir@ | ||
| -LIBDIR:=$(DESTDIR)@libdir@ | ||
| -BINDIR:=$(DESTDIR)@bindir@ | ||
| +INCLUDEDIR:=@includedir@ | ||
| +LIBDIR:=@libdir@ | ||
| +BINDIR:=@bindir@ | ||
| PKGCONFIGDIR:=$(LIBDIR)/pkgconfig | ||
|
|
||
| HOST_OS:=@host_os@ | ||
| @@ -202,10 +202,10 @@ BUILD_DIRS += \ | ||
| endif | ||
|
|
||
| INSTALL_DIRS := \ | ||
| - $(LIBDIR) $(INCLUDEDIR)/flint \ | ||
| - $(PKGCONFIGDIR) | ||
| + $(DESTDIR)$(LIBDIR) $(DESTDIR)$(INCLUDEDIR)/flint \ | ||
| + $(DESTDIR)$(PKGCONFIGDIR) | ||
| ifneq ($(FLINT_DLLLIB),0) | ||
| -INSTALL_DIRS += $(BINDIR) | ||
| +INSTALL_DIRS += $(DESTDIR)$(BINDIR) | ||
| endif | ||
|
|
||
| ################################################################################ | ||
| @@ -722,41 +722,41 @@ distclean: clean | ||
| ################################################################################ | ||
|
|
||
| install: library | $(INSTALL_DIRS) | ||
| - $(CP) flint.pc $(PKGCONFIGDIR)/flint.pc | ||
| + $(CP) flint.pc $(DESTDIR)$(PKGCONFIGDIR)/flint.pc | ||
| ifneq ($(SHARED), 0) | ||
| ifneq ($(FLINT_DLLLIB),0) | ||
| - $(CP_A) $(FLINT_DIR)/$(FLINT_LIB) $(BINDIR) | ||
| - $(CP_A) $(FLINT_DIR)/$(FLINT_LIB_MAJOR) $(BINDIR) | ||
| - $(CP_A) $(FLINT_DIR)/$(FLINT_LIB_FULL) $(BINDIR) | ||
| - $(CP) $(FLINT_DIR)/$(FLINT_IMPLIB) $(LIBDIR) | ||
| + $(CP_A) $(FLINT_DIR)/$(FLINT_LIB) $(DESTDIR)$(BINDIR) | ||
| + $(CP_A) $(FLINT_DIR)/$(FLINT_LIB_MAJOR) $(DESTDIR)$(BINDIR) | ||
| + $(CP_A) $(FLINT_DIR)/$(FLINT_LIB_FULL) $(DESTDIR)$(BINDIR) | ||
| + $(CP) $(FLINT_DIR)/$(FLINT_IMPLIB) $(DESTDIR)$(LIBDIR) | ||
| else | ||
| - $(CP_A) $(FLINT_DIR)/$(FLINT_LIB) $(LIBDIR) | ||
| - $(CP_A) $(FLINT_DIR)/$(FLINT_LIB_MAJOR) $(LIBDIR) | ||
| - $(CP_A) $(FLINT_DIR)/$(FLINT_LIB_FULL) $(LIBDIR) | ||
| + $(CP_A) $(FLINT_DIR)/$(FLINT_LIB) $(DESTDIR)$(LIBDIR) | ||
| + $(CP_A) $(FLINT_DIR)/$(FLINT_LIB_MAJOR) $(DESTDIR)$(LIBDIR) | ||
| + $(CP_A) $(FLINT_DIR)/$(FLINT_LIB_FULL) $(DESTDIR)$(LIBDIR) | ||
| endif | ||
| ifneq ($(FLINT_DYLIB),0) | ||
| - install_name_tool -id $(LIBDIR)/$(FLINT_LIB_FULL) $(LIBDIR)/$(FLINT_LIB) | ||
| + install_name_tool -id $(LIBDIR)/$(FLINT_LIB_FULL) $(DESTDIR)$(LIBDIR)/$(FLINT_LIB) | ||
| endif | ||
| endif | ||
| ifneq ($(STATIC), 0) | ||
| - $(CP) $(FLINT_DIR)/$(FLINT_LIB_STATIC) $(LIBDIR) | ||
| + $(CP) $(FLINT_DIR)/$(FLINT_LIB_STATIC) $(DESTDIR)$(LIBDIR) | ||
| endif | ||
| - $(CP) $(HEADERS) $(INCLUDEDIR)/flint | ||
| + $(CP) $(HEADERS) $(DESTDIR)$(INCLUDEDIR)/flint | ||
|
|
||
| uninstall: | ||
| - $(RM_F) $(PKGCONFIGDIR)/flint.pc | ||
| + $(RM_F) $(DESTDIR)$(PKGCONFIGDIR)/flint.pc | ||
| ifneq ($(FLINT_DLLLIB),0) | ||
| - $(RM_F) $(BINDIR)/$(FLINT_LIB) | ||
| - $(RM_F) $(BINDIR)/$(FLINT_LIB_MAJOR) | ||
| - $(RM_F) $(BINDIR)/$(FLINT_LIB_FULL) | ||
| - $(RM_F) $(LIBDIR)/$(FLINT_IMPLIB) | ||
| + $(RM_F) $(DESTDIR)$(BINDIR)/$(FLINT_LIB) | ||
| + $(RM_F) $(DESTDIR)$(BINDIR)/$(FLINT_LIB_MAJOR) | ||
| + $(RM_F) $(DESTDIR)$(BINDIR)/$(FLINT_LIB_FULL) | ||
| + $(RM_F) $(DESTDIR)$(LIBDIR)/$(FLINT_IMPLIB) | ||
| else | ||
| - $(RM_F) $(LIBDIR)/$(FLINT_LIB) | ||
| - $(RM_F) $(LIBDIR)/$(FLINT_LIB_MAJOR) | ||
| - $(RM_F) $(LIBDIR)/$(FLINT_LIB_FULL) | ||
| + $(RM_F) $(DESTDIR)$(LIBDIR)/$(FLINT_LIB) | ||
| + $(RM_F) $(DESTDIR)$(LIBDIR)/$(FLINT_LIB_MAJOR) | ||
| + $(RM_F) $(DESTDIR)$(LIBDIR)/$(FLINT_LIB_FULL) | ||
| endif | ||
| - $(RM_F) $(LIBDIR)/$(FLINT_LIB_STATIC) | ||
| - $(RM_RF) $(INCLUDEDIR)/flint | ||
| + $(RM_F) $(DESTDIR)$(LIBDIR)/$(FLINT_LIB_STATIC) | ||
| + $(RM_RF) $(DESTDIR)$(INCLUDEDIR)/flint | ||
|
|
||
| ################################################################################ | ||
| # maintainer stuff | ||
| -- | ||
| 2.42.0 | ||
|
|