svn commit: r478497 - in head/sysutils/google-compute-engine-oslogin: . files

Yuri Victorovich yuri at FreeBSD.org
Thu Aug 30 21:00:22 UTC 2018


Author: yuri
Date: Thu Aug 30 21:00:21 2018
New Revision: 478497
URL: https://svnweb.freebsd.org/changeset/ports/478497

Log:
  sysutils/google-compute-engine-oslogin: Unbreak build
  
  Remove USE_GCC, add patch, add localbase:ldflags.
  
  PR:		230466
  Submitted by:	Dmitri Goutnik <dg at syrec.org>
  Approved by:	helen.koike at collabora.com (maintainer)

Added:
  head/sysutils/google-compute-engine-oslogin/files/patch-Makefile   (contents, props changed)
Modified:
  head/sysutils/google-compute-engine-oslogin/Makefile

Modified: head/sysutils/google-compute-engine-oslogin/Makefile
==============================================================================
--- head/sysutils/google-compute-engine-oslogin/Makefile	Thu Aug 30 20:53:47 2018	(r478496)
+++ head/sysutils/google-compute-engine-oslogin/Makefile	Thu Aug 30 21:00:21 2018	(r478497)
@@ -2,7 +2,7 @@
 
 PORTNAME=	google-compute-engine-oslogin
 DISTVERSION=	1.3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 
 MAINTAINER=	helen.koike at collabora.com
@@ -20,9 +20,8 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
 RUN_DEPENDS=	gsed:textproc/gsed \
 		${LOCALBASE}/lib/pam_mkhomedir.so:security/pam_mkhomedir
 
-USES=		gmake
+USES=		gmake localbase:ldflags
 USE_LDCONFIG=	yes
-USE_GCC=	any
 USE_GITHUB=	yes
 GH_ACCOUNT=	GoogleCloudPlatform
 GH_PROJECT=	compute-image-packages

Added: head/sysutils/google-compute-engine-oslogin/files/patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/google-compute-engine-oslogin/files/patch-Makefile	Thu Aug 30 21:00:21 2018	(r478497)
@@ -0,0 +1,20 @@
+--- Makefile.orig	2018-06-11 17:16:50 UTC
++++ Makefile
+@@ -96,7 +96,7 @@ $(NSS): $(NSS_LIBRARY_SOURCE) $(UTILS)
+ 	$(NSS_SRC) $(UTILS) $(LIBS)
+ 
+ $(NSS_CACHE_BIN): $(NSS_CACHE_SRC) $(UTILS_SRC)
+-	$(CXX) $(LDFLAGS) $(INCLUDE_FLAGS) -o $(NSS_CACHE_BIN) $(NSS_CACHE_SRC) $(UTILS_SRC) $(LIBS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(INCLUDE_FLAGS) -o $(NSS_CACHE_BIN) $(NSS_CACHE_SRC) $(UTILS_SRC) $(LIBS)
+ 
+ $(LIBNSS_CACHE_OSLOGIN_NAME): $(LIBNSS_CACHE_OBJ) $(LIBNSS_COMPAT_OBJ)
+ 	$(CXX) $(LIBNSS_SO_FLAGS) -o $(LIBNSS_CACHE_OSLOGIN_NAME) $(LIBNSS_CACHE_OBJ) $(LIBNSS_COMPAT_OBJ)
+@@ -122,7 +122,7 @@ $(PAM_ADMIN_OBJ): $(PAM_ADMIN_SRC)
+ 	$(CXX) $(CXXFLAGS) -c $(PAM_ADMIN_SRC) -o $(PAM_ADMIN_OBJ)
+ 
+ $(AUTHKEYS_BIN): $(AUTHKEYS_SRC) $(UTILS_SRC)
+-	$(CXX) $(LDFLAGS) $(INCLUDE_FLAGS) -o $(AUTHKEYS_BIN) $(AUTHKEYS_SRC) $(UTILS_SRC) $(LIBS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(INCLUDE_FLAGS) -o $(AUTHKEYS_BIN) $(AUTHKEYS_SRC) $(UTILS_SRC) $(LIBS)
+ 
+ $(UTILS): $(UTILS_SRC)
+ 	$(CXX) $(CXXFLAGS) $(INCLUDE_FLAGS) -c $(UTILS_SRC) -o $(UTILS)


More information about the svn-ports-all mailing list