Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 17 Oct 2019 10:44:55 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r514656 - head/astro/astrometry/files
Message-ID:  <201910171044.x9HAitlZ085558@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danfe
Date: Thu Oct 17 10:44:55 2019
New Revision: 514656
URL: https://svnweb.freebsd.org/changeset/ports/514656

Log:
  Amend the patch to ensure that all installed shared objects are properly
  stripped when needed (should've been part of r514340).

Modified:
  head/astro/astrometry/files/patch-util_Makefile

Modified: head/astro/astrometry/files/patch-util_Makefile
==============================================================================
--- head/astro/astrometry/files/patch-util_Makefile	Thu Oct 17 10:39:01 2019	(r514655)
+++ head/astro/astrometry/files/patch-util_Makefile	Thu Oct 17 10:44:55 2019	(r514656)
@@ -1,6 +1,17 @@
 --- util/Makefile.orig	2019-04-22 16:25:30 UTC
 +++ util/Makefile
-@@ -209,7 +209,9 @@ pyinstall:
+@@ -198,7 +198,9 @@ LINK_DIR := $(PY_BASE_LINK_DIR)/util
+ install: install-core
+ 	$(MAKE) install-core
+ 	@echo "The following copy commands may fail; they are optional."
+-	-$(MAKE) py && $(CP) _util$(PYTHON_SO_EXT) util.py '$(PY_INSTALL_DIR)'
++	-$(MAKE) py
++	-$(CP) util.py '$(PY_INSTALL_DIR)'
++	-$(BSD_INSTALL_LIB) _util$(PYTHON_SO_EXT) '$(PY_INSTALL_DIR)'
+ 	@echo ok
+ 
+ .PHONY: install
+@@ -209,7 +211,9 @@ pyinstall:
  		echo $(CP) $$x '$(PY_INSTALL_DIR)/'$$x; \
  		$(CP) $$x '$(PY_INSTALL_DIR)/'$$x; \
  	done
@@ -11,7 +22,7 @@
  
  .PHONY: pyinstall
  
-@@ -233,8 +235,8 @@ install-core: $(PYTHON_EXECS) $(PROGS) $(MAIN_PROGS) $
+@@ -233,8 +237,8 @@ install-core: $(PYTHON_EXECS) $(PROGS) $(MAIN_PROGS) $
  	done
  	@echo Installing executables into '$(BIN_INSTALL_DIR)'...
  	@for x in $(PROGS) $(MAIN_PROGS); do \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910171044.x9HAitlZ085558>