Attachment #196012 for bug #230466

View | Details | Raw Unified | Return to bug 230466
Collapse All | Expand All

Lines 20-28 Link Here

(-)sysutils/google-compute-engine-oslogin/Makefile (-2 / +1 lines)
20	RUN_DEPENDS= gsed:textproc/gsed \	20	RUN_DEPENDS= gsed:textproc/gsed \
21	${LOCALBASE}/lib/pam_mkhomedir.so:security/pam_mkhomedir	21	${LOCALBASE}/lib/pam_mkhomedir.so:security/pam_mkhomedir
22		22
23	USES= gmake	23	USES= gmake localbase:ldflags
24	USE_LDCONFIG= yes	24	USE_LDCONFIG= yes
25	USE_GCC= any
26	USE_GITHUB= yes	25	USE_GITHUB= yes
27	GH_ACCOUNT= GoogleCloudPlatform	26	GH_ACCOUNT= GoogleCloudPlatform
28	GH_PROJECT= compute-image-packages	27	GH_PROJECT= compute-image-packages




--- 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)

Return to bug 230466

Line 0 Link Here

(-)sysutils/google-compute-engine-oslogin/files/patch-Makefile (+20 lines)
	1	--- Makefile.orig 2018-06-11 17:16:50 UTC
	2	+++ Makefile
	3	@@ -96,7 +96,7 @@ $(NSS): $(NSS_LIBRARY_SOURCE) $(UTILS)
	4	$(NSS_SRC) $(UTILS) $(LIBS)
	5
	6	$(NSS_CACHE_BIN): $(NSS_CACHE_SRC) $(UTILS_SRC)
	7	- $(CXX) $(LDFLAGS) $(INCLUDE_FLAGS) -o $(NSS_CACHE_BIN) $(NSS_CACHE_SRC) $(UTILS_SRC) $(LIBS)
	8	+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(INCLUDE_FLAGS) -o $(NSS_CACHE_BIN) $(NSS_CACHE_SRC) $(UTILS_SRC) $(LIBS)
	9
	10	$(LIBNSS_CACHE_OSLOGIN_NAME): $(LIBNSS_CACHE_OBJ) $(LIBNSS_COMPAT_OBJ)
	11	$(CXX) $(LIBNSS_SO_FLAGS) -o $(LIBNSS_CACHE_OSLOGIN_NAME) $(LIBNSS_CACHE_OBJ) $(LIBNSS_COMPAT_OBJ)
	12	@@ -122,7 +122,7 @@ $(PAM_ADMIN_OBJ): $(PAM_ADMIN_SRC)
	13	$(CXX) $(CXXFLAGS) -c $(PAM_ADMIN_SRC) -o $(PAM_ADMIN_OBJ)
	14
	15	$(AUTHKEYS_BIN): $(AUTHKEYS_SRC) $(UTILS_SRC)
	16	- $(CXX) $(LDFLAGS) $(INCLUDE_FLAGS) -o $(AUTHKEYS_BIN) $(AUTHKEYS_SRC) $(UTILS_SRC) $(LIBS)
	17	+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(INCLUDE_FLAGS) -o $(AUTHKEYS_BIN) $(AUTHKEYS_SRC) $(UTILS_SRC) $(LIBS)
	18
	19	$(UTILS): $(UTILS_SRC)
	20	$(CXX) $(CXXFLAGS) $(INCLUDE_FLAGS) -c $(UTILS_SRC) -o $(UTILS)