aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuri Victorovich <yuri@FreeBSD.org>2018-08-30 21:00:21 +0000
committerYuri Victorovich <yuri@FreeBSD.org>2018-08-30 21:00:21 +0000
commit669edd9fd1449bbc17a3149bfaca6cf523fdf5c4 (patch)
treee38bf217f5e4dc14f3dca9795a40b7ac27813422
parentb5e7b48024165c522b38f335f7ca7260237708d4 (diff)
downloadports-669edd9fd1449bbc17a3149bfaca6cf523fdf5c4.tar.gz
ports-669edd9fd1449bbc17a3149bfaca6cf523fdf5c4.zip
Notes
-rw-r--r--sysutils/google-compute-engine-oslogin/Makefile5
-rw-r--r--sysutils/google-compute-engine-oslogin/files/patch-Makefile20
2 files changed, 22 insertions, 3 deletions
diff --git a/sysutils/google-compute-engine-oslogin/Makefile b/sysutils/google-compute-engine-oslogin/Makefile
index cc37955fa529..cf449581a9e8 100644
--- a/sysutils/google-compute-engine-oslogin/Makefile
+++ b/sysutils/google-compute-engine-oslogin/Makefile
@@ -2,7 +2,7 @@
PORTNAME= google-compute-engine-oslogin
DISTVERSION= 1.3.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils
MAINTAINER= helen.koike@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
diff --git a/sysutils/google-compute-engine-oslogin/files/patch-Makefile b/sysutils/google-compute-engine-oslogin/files/patch-Makefile
new file mode 100644
index 000000000000..695061d09c6d
--- /dev/null
+++ b/sysutils/google-compute-engine-oslogin/files/patch-Makefile
@@ -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)