CVS commit: pkgsrc/www

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Mar 15 18:35:22 UTC 2024

Modified Files:
        pkgsrc/www/nginx: Makefile
        pkgsrc/www/nginx-devel: Makefile

Log Message:
nginx: Do not hardcode COMPILER_RPATH_FLAG.


To generate a diff of this commit:
cvs rdiff -u -r1.150 -r1.151 pkgsrc/www/nginx/Makefile
cvs rdiff -u -r1.121 -r1.122 pkgsrc/www/nginx-devel/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/nginx/Makefile
diff -u pkgsrc/www/nginx/Makefile:1.150 pkgsrc/www/nginx/Makefile:1.151
--- pkgsrc/www/nginx/Makefile:1.150     Fri Feb 16 18:12:28 2024
+++ pkgsrc/www/nginx/Makefile   Fri Mar 15 18:35:22 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.150 2024/02/16 18:12:28 osa Exp $
+# $NetBSD: Makefile,v 1.151 2024/03/15 18:35:22 nia Exp $
 
 DISTNAME=      nginx-1.24.0
 PKGREVISION=   17
@@ -36,7 +36,7 @@ USE_PKGLOCALEDIR=     yes
 HAS_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --user=${NGINX_USER}
 CONFIGURE_ARGS+=       --group=${NGINX_GROUP}
-CONFIGURE_ARGS+=       --with-ld-opt=-L${PREFIX}/lib\ -Wl,-R${PREFIX}/lib
+CONFIGURE_ARGS+=       --with-ld-opt=-L${PREFIX}/lib\ ${COMPILER_RPATH_FLAG}${PREFIX}/lib
 CONFIGURE_ARGS+=       --prefix=${PREFIX}
 CONFIGURE_ARGS+=       --sbin-path=${PREFIX}/sbin
 CONFIGURE_ARGS+=       --conf-path=${PKG_SYSCONFDIR}/nginx.conf

Index: pkgsrc/www/nginx-devel/Makefile
diff -u pkgsrc/www/nginx-devel/Makefile:1.121 pkgsrc/www/nginx-devel/Makefile:1.122
--- pkgsrc/www/nginx-devel/Makefile:1.121       Fri Feb 16 18:07:30 2024
+++ pkgsrc/www/nginx-devel/Makefile     Fri Mar 15 18:35:22 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.121 2024/02/16 18:07:30 osa Exp $
+# $NetBSD: Makefile,v 1.122 2024/03/15 18:35:22 nia Exp $
 
 DISTNAME=      nginx-1.25.4
 PKGNAME=       ${DISTNAME:S/-/-devel-/1}
@@ -37,7 +37,7 @@ USE_PKGLOCALEDIR=     yes
 HAS_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --user=${NGINX_USER}
 CONFIGURE_ARGS+=       --group=${NGINX_GROUP}
-CONFIGURE_ARGS+=       --with-ld-opt=-L${PREFIX}/lib\ -Wl,-R${PREFIX}/lib
+CONFIGURE_ARGS+=       --with-ld-opt=-L${PREFIX}/lib\ ${COMPILER_RPATH_FLAG}${PREFIX}/lib
 CONFIGURE_ARGS+=       --prefix=${PREFIX}
 CONFIGURE_ARGS+=       --sbin-path=${PREFIX}/sbin
 CONFIGURE_ARGS+=       --conf-path=${PKG_SYSCONFDIR}/nginx.conf