Created
June 18, 2013 19:01
-
-
Save tjfontaine/5808235 to your computer and use it in GitHub Desktop.
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
From 6968f8c6aaa5da35ccf75312786841494b61b7e7 Mon Sep 17 00:00:00 2001 | |
From: Timothy J Fontaine <tjfontaine@gmail.com> | |
Date: Tue, 18 Jun 2013 18:30:35 +0000 | |
Subject: [PATCH] build: pkgsrc use ld -R and include symlinks | |
--- | |
Makefile | 8 ++++---- | |
1 files changed, 4 insertions(+), 4 deletions(-) | |
diff --git a/Makefile b/Makefile | |
index 78cebdb..4c53123 100644 | |
--- a/Makefile | |
+++ b/Makefile | |
@@ -320,14 +320,14 @@ binary: $(BINARYTAR) | |
$(PKGSRC): release-only | |
rm -rf dist out | |
- $(PYTHON) configure --prefix=/ --without-snapshot \ | |
+ $(PYTHON) configure --prefix=/opt/local --without-snapshot \ | |
--dest-cpu=$(DESTCPU) --tag=$(TAG) $(CONFIG_FLAGS) | |
- $(MAKE) install DESTDIR=dist | |
- (cd dist; find * -type f | sort) > packlist | |
+ LDFLAGS="-R /opt/local/gcc47/lib/amd64:/opt/local/lib" $(MAKE) install DESTDIR=dist | |
+ (cd dist/opt/local; find * -type f -o -type l | sort) > packlist | |
pkg_info -X pkg_install | \ | |
egrep '^(MACHINE_ARCH|OPSYS|OS_VERSION|PKGTOOLS_VERSION)' > build-info | |
pkg_create -B build-info -c tools/pkgsrc/comment -d tools/pkgsrc/description \ | |
- -f packlist -I /opt/local -p dist -U $(PKGSRC) | |
+ -f packlist -I /opt/local -p dist/opt/local -U $(PKGSRC) | |
pkgsrc: $(PKGSRC) | |
-- | |
1.7.6.3 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment