head	1.3;
access;
symbols
	pkgsrc-2026Q1:1.3.0.100
	pkgsrc-2026Q1-base:1.3
	pkgsrc-2025Q4:1.3.0.98
	pkgsrc-2025Q4-base:1.3
	pkgsrc-2025Q3:1.3.0.96
	pkgsrc-2025Q3-base:1.3
	pkgsrc-2025Q2:1.3.0.94
	pkgsrc-2025Q2-base:1.3
	pkgsrc-2025Q1:1.3.0.92
	pkgsrc-2025Q1-base:1.3
	pkgsrc-2024Q4:1.3.0.90
	pkgsrc-2024Q4-base:1.3
	pkgsrc-2024Q3:1.3.0.88
	pkgsrc-2024Q3-base:1.3
	pkgsrc-2024Q2:1.3.0.86
	pkgsrc-2024Q2-base:1.3
	pkgsrc-2024Q1:1.3.0.84
	pkgsrc-2024Q1-base:1.3
	pkgsrc-2023Q4:1.3.0.82
	pkgsrc-2023Q4-base:1.3
	pkgsrc-2023Q3:1.3.0.80
	pkgsrc-2023Q3-base:1.3
	pkgsrc-2023Q2:1.3.0.78
	pkgsrc-2023Q2-base:1.3
	pkgsrc-2023Q1:1.3.0.76
	pkgsrc-2023Q1-base:1.3
	pkgsrc-2022Q4:1.3.0.74
	pkgsrc-2022Q4-base:1.3
	pkgsrc-2022Q3:1.3.0.72
	pkgsrc-2022Q3-base:1.3
	pkgsrc-2022Q2:1.3.0.70
	pkgsrc-2022Q2-base:1.3
	pkgsrc-2022Q1:1.3.0.68
	pkgsrc-2022Q1-base:1.3
	pkgsrc-2021Q4:1.3.0.66
	pkgsrc-2021Q4-base:1.3
	pkgsrc-2021Q3:1.3.0.64
	pkgsrc-2021Q3-base:1.3
	pkgsrc-2021Q2:1.3.0.62
	pkgsrc-2021Q2-base:1.3
	pkgsrc-2021Q1:1.3.0.60
	pkgsrc-2021Q1-base:1.3
	pkgsrc-2020Q4:1.3.0.58
	pkgsrc-2020Q4-base:1.3
	pkgsrc-2020Q3:1.3.0.56
	pkgsrc-2020Q3-base:1.3
	pkgsrc-2020Q2:1.3.0.52
	pkgsrc-2020Q2-base:1.3
	pkgsrc-2020Q1:1.3.0.32
	pkgsrc-2020Q1-base:1.3
	pkgsrc-2019Q4:1.3.0.54
	pkgsrc-2019Q4-base:1.3
	pkgsrc-2019Q3:1.3.0.50
	pkgsrc-2019Q3-base:1.3
	pkgsrc-2019Q2:1.3.0.48
	pkgsrc-2019Q2-base:1.3
	pkgsrc-2019Q1:1.3.0.46
	pkgsrc-2019Q1-base:1.3
	pkgsrc-2018Q4:1.3.0.44
	pkgsrc-2018Q4-base:1.3
	pkgsrc-2018Q3:1.3.0.42
	pkgsrc-2018Q3-base:1.3
	pkgsrc-2018Q2:1.3.0.40
	pkgsrc-2018Q2-base:1.3
	pkgsrc-2018Q1:1.3.0.38
	pkgsrc-2018Q1-base:1.3
	pkgsrc-2017Q4:1.3.0.36
	pkgsrc-2017Q4-base:1.3
	pkgsrc-2017Q3:1.3.0.34
	pkgsrc-2017Q3-base:1.3
	pkgsrc-2017Q2:1.3.0.30
	pkgsrc-2017Q2-base:1.3
	pkgsrc-2017Q1:1.3.0.28
	pkgsrc-2017Q1-base:1.3
	pkgsrc-2016Q4:1.3.0.26
	pkgsrc-2016Q4-base:1.3
	pkgsrc-2016Q3:1.3.0.24
	pkgsrc-2016Q3-base:1.3
	pkgsrc-2016Q2:1.3.0.22
	pkgsrc-2016Q2-base:1.3
	pkgsrc-2016Q1:1.3.0.20
	pkgsrc-2016Q1-base:1.3
	pkgsrc-2015Q4:1.3.0.18
	pkgsrc-2015Q4-base:1.3
	pkgsrc-2015Q3:1.3.0.16
	pkgsrc-2015Q3-base:1.3
	pkgsrc-2015Q2:1.3.0.14
	pkgsrc-2015Q2-base:1.3
	pkgsrc-2015Q1:1.3.0.12
	pkgsrc-2015Q1-base:1.3
	pkgsrc-2014Q4:1.3.0.10
	pkgsrc-2014Q4-base:1.3
	pkgsrc-2014Q3:1.3.0.8
	pkgsrc-2014Q3-base:1.3
	pkgsrc-2014Q2:1.3.0.6
	pkgsrc-2014Q2-base:1.3
	pkgsrc-2014Q1:1.3.0.4
	pkgsrc-2014Q1-base:1.3
	pkgsrc-2013Q4:1.3.0.2
	pkgsrc-2013Q4-base:1.3
	pkgsrc-2013Q3:1.2.0.44
	pkgsrc-2013Q3-base:1.2
	pkgsrc-2013Q2:1.2.0.42
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2013Q1:1.2.0.40
	pkgsrc-2013Q1-base:1.2
	pkgsrc-2012Q4:1.2.0.38
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2012Q3:1.2.0.36
	pkgsrc-2012Q3-base:1.2
	pkgsrc-2012Q2:1.2.0.34
	pkgsrc-2012Q2-base:1.2
	pkgsrc-2012Q1:1.2.0.32
	pkgsrc-2012Q1-base:1.2
	pkgsrc-2011Q4:1.2.0.30
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q3:1.2.0.28
	pkgsrc-2011Q3-base:1.2
	pkgsrc-2011Q2:1.2.0.26
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2011Q1:1.2.0.24
	pkgsrc-2011Q1-base:1.2
	pkgsrc-2010Q4:1.2.0.22
	pkgsrc-2010Q4-base:1.2
	pkgsrc-2010Q3:1.2.0.20
	pkgsrc-2010Q3-base:1.2
	pkgsrc-2010Q2:1.2.0.18
	pkgsrc-2010Q2-base:1.2
	pkgsrc-2010Q1:1.2.0.16
	pkgsrc-2010Q1-base:1.2
	pkgsrc-2009Q4:1.2.0.14
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2009Q3:1.2.0.12
	pkgsrc-2009Q3-base:1.2
	pkgsrc-2009Q2:1.2.0.10
	pkgsrc-2009Q2-base:1.2
	pkgsrc-2009Q1:1.2.0.8
	pkgsrc-2009Q1-base:1.2
	pkgsrc-2008Q4:1.2.0.6
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.4
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.2
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.1.0.18
	pkgsrc-2008Q2-base:1.1
	cwrapper:1.1.0.16
	pkgsrc-2008Q1:1.1.0.14
	pkgsrc-2008Q1-base:1.1
	pkgsrc-2007Q4:1.1.0.12
	pkgsrc-2007Q4-base:1.1
	pkgsrc-2007Q3:1.1.0.10
	pkgsrc-2007Q3-base:1.1
	pkgsrc-2007Q2:1.1.0.8
	pkgsrc-2007Q2-base:1.1
	pkgsrc-2007Q1:1.1.0.6
	pkgsrc-2007Q1-base:1.1
	pkgsrc-2006Q4:1.1.0.4
	pkgsrc-2006Q4-base:1.1
	pkgsrc-2006Q3:1.1.0.2
	pkgsrc-2006Q3-base:1.1;
locks; strict;
comment	@# @;


1.3
date	2013.10.20.17.48.26;	author joerg;	state Exp;
branches;
next	1.2;
commitid	rGLw5D2Qcnu3G3ax;

1.2
date	2008.08.17.20.09.12;	author dholland;	state Exp;
branches;
next	1.1;

1.1
date	2006.08.14.22.36.47;	author wiz;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Pass rpath options with the correct -Wl prefix.
@
text
@$NetBSD: patch-ag,v 1.2 2008/08/17 20:09:12 dholland Exp $

--- src/Modules/Makefile.orig	2004-09-16 18:05:58.000000000 -0400
+++ src/Modules/Makefile	2008-08-17 15:31:09.000000000 -0400
@@@@ -5,15 +5,16 @@@@ HSMLEXEC_MOD=HsmlExec.so
 HSMLEXEC_OBJS=HsmlExec.o ../Hsml/Cache.o ../Hsml/Headers.o ../Hsml/SubLang.o
 CFLAGS+=${DEFS}
 CFLAGS+=-I/usr/pkg/include 
+PICFLAGS?=-fPIC
 #libscrews.a
-LDFLAGS+=-Wl,-R${PREFIX}/lib -L${PREFIX}/lib -L. 
+LDFLAGS+=${COMPILER_RPATH_FLAG}${PREFIX}/lib -L${PREFIX}/lib -L. 
 #-lscrews
 
 all: hsmlexec
 	@@if [ "${DLOPEN}" = "1" ]; then \
 	for A in $(MODS); do  \
 		echo "[modules] $$A.so";  \
-		$(CC) ${CFLAGS} -fPIC -c $$A.c ; \
+		$(CC) ${CFLAGS} ${PICFLAGS} -c $$A.c ; \
 		$(CC) ${LDFLAGS} -o $$A.so -shared $$A.o ; done ; fi
 	@@echo "** BUILD MODULES ** OK"
 
@@@@ -21,10 +22,10 @@@@ hsmlexec:
 	@@rm -f HsmlExec.o
 	@@if [ "${INCORE_LUA}" = "1" ]; then \
            echo "[modules] HsmlExec.so << injecting lua into the core." ;\
-	   ${CC} ${CFLAGS} -DINCORE_LUA=1 -fPIC -c HsmlExec.c ;\
-	   ${CC} ${LDFLAGS} -lm -llua -llualib ${HSMLEXEC_OBJS} -shared -o ${HSMLEXEC_MOD} ;\
+	   ${CC} ${CFLAGS} ${PICFLAGS} -DINCORE_LUA=1 -c HsmlExec.c ;\
+	   ${CC} ${LDFLAGS} -lm -llua ${HSMLEXEC_OBJS} -shared -o ${HSMLEXEC_MOD} ;\
 	else \
-	$(CC) ${CFLAGS} -c HsmlExec.c ;\
+	$(CC) ${CFLAGS} ${PICFLAGS} -c HsmlExec.c ;\
 	$(CC) ${LDFLAGS} ${HSMLEXEC_OBJS} -shared -o ${HSMLEXEC_MOD} ;\
 	fi
 	
@


1.2
log
@Fix broken amd64 build:
   - use -fPIC in all the needed places.
   - add USE_TOOLS+=gmake; this requires gmake to build properly.
   - add missing dir to PLIST.
Also fix some LP64 issues that warned but didn't break the build.

Note however that the SSL code will not work in an LP64 environment;
it relies heavily on being able to cast pointers to int without losing
information. The ssl option should probably be blacklisted on LP64
platforms.

PKGREVISION++.
@
text
@d1 1
a1 1
$NetBSD: patch-ag,v 1.1 2006/08/14 22:36:47 wiz Exp $
d5 1
a5 1
@@@@ -5,6 +5,7 @@@@ HSMLEXEC_MOD=HsmlExec.so
d11 2
a12 1
 LDFLAGS+=-Wl,-R${PREFIX}/lib -L${PREFIX}/lib -L. 
d14 2
a15 1
@@@@ -13,7 +14,7 @@@@ all: hsmlexec
@


1.1
log
@Adapt for lua-5.1.1. Bump PKGREVISION.
@
text
@d1 1
a1 1
$NetBSD$
d3 21
a23 3
--- src/Modules/Makefile.orig	2004-09-16 22:05:58.000000000 +0000
+++ src/Modules/Makefile
@@@@ -22,7 +22,7 @@@@ hsmlexec:
d26 1
a26 1
 	   ${CC} ${CFLAGS} -DINCORE_LUA=1 -fPIC -c HsmlExec.c ;\
d28 1
d31 2
a32 1
 	$(CC) ${CFLAGS} -c HsmlExec.c ;\
d34 2
@