[BACK]Return to patch-extras_swig_makefile CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / textproc / libhighlight / patches

File: [cvs.NetBSD.org] / pkgsrc / textproc / libhighlight / patches / patch-extras_swig_makefile (download)

Revision 1.3, Wed Dec 18 01:34:34 2019 UTC (11 months, 1 week ago) by schmonz
Branch: MAIN
CVS Tags: pkgsrc-2020Q3-base, pkgsrc-2020Q3, pkgsrc-2020Q2-base, pkgsrc-2020Q2, pkgsrc-2020Q1-base, pkgsrc-2020Q1, pkgsrc-2019Q4-base, pkgsrc-2019Q4, HEAD
Changes since 1.2: +11 -11 lines

Update to 3.54 (during the freeze, for the bugfixes). From the changelog:

- fixed default colour output in BBCode
  (https://gitlab.com/saalen/highlight/issues/134)
- fixed corner case in sh.lang
- fixed syntax tests with UTF-8 input
  (https://gitlab.com/saalen/highlight/issues/123)
- added support for Bash in outhtml_codefold.lua plug-in
- added ballerina.lang
- added block strings to java.lang
- added author hints in themes and language definitions
- added C++20 reserved words in c.lang
- added editorconfig file and validated all files accordingly (thanks to
  Tristano Ajmone)
- CLI: fixed `--list-scripts` with `-d` or HIGHLIGHT_DATADIR env variable
  (https://gitlab.com/saalen/highlight/issues/139)
- GUI W32: replaced multibyte path trace window by startup hint if
  NtfsDisable8dot3NameCreation is set
- GUI: removed AsciiDoc instruction lines from the README popup window

$NetBSD: patch-extras_swig_makefile,v 1.3 2019/12/18 01:34:34 schmonz Exp $

Use pkgsrc-specified compiler and flags.

--- extras/swig/makefile.orig	2019-11-11 16:57:10.000000000 +0000
+++ extras/swig/makefile
@@ -1,6 +1,6 @@
 
-CXX=g++
-CFLAGS=-g -O2 -fPIC
+#CXX=g++
+#CFLAGS=-g -O2 -fPIC
 
 HL_INC=../../src/include/
 HL_SRC=../../src/
@@ -12,24 +12,24 @@ PERL_INC=$(shell perl -MExtUtils::Embed 
 PHP_INC=$(shell php-config --includes)
 
 lib-stamp:
-	make -C ../.. -f ./makefile clean-obj
-	PIC=1 make -C ../.. -f ./makefile CFLAGS="${CFLAGS}" lib-static
+	#make -C ../.. -f ./makefile clean-obj
+	#PIC=1 make -C ../.. -f ./makefile CFLAGS="${CFLAGS}" lib-static
 	touch $@
 
 python: lib-stamp
-	swig -c++ -python -o highlight_wrap.cpp  highlight.i
-	${CXX} ${CFLAGS} -c highlight_wrap.cpp ${LUA_CFLAGS} ${PYTHON_CFLAGS} -I${HL_INC}
-	${CXX} -shared -s highlight_wrap.o  -L${HL_SRC} -lhighlight ${LUA_LIBS} -lpython2.7 -o _highlight.so
+	swig3.0 -c++ -python -o highlight_wrap.cpp  highlight.i
+	${CXX} ${CFLAGS} ${LDFLAGS} -c highlight_wrap.cpp ${LUA_CFLAGS} ${PYTHON_CFLAGS} -I${HL_INC}
+	${CXX} ${CXXFLAGS} ${LDFLAGS} -shared -s highlight_wrap.o  -L${HL_SRC} -lhighlight ${LUA_LIBS} -lpython2.7 -o _highlight.so
 
 perl: lib-stamp
-	swig -c++ -perl -o highlight_wrap.cpp  highlight.i
-	${CXX} ${CFLAGS} -c highlight_wrap.cpp ${LUA_CFLAGS} ${PERL_INC} -I${HL_INC}
-	${CXX} -shared -s highlight_wrap.o  -L${HL_SRC} -lhighlight ${LUA_LIBS} -o highlight.so
+	swig3.0 -c++ -perl -o highlight_wrap.cpp  highlight.i
+	${CXX} ${CFLAGS} ${LDFLAGS} -c highlight_wrap.cpp ${LUA_CFLAGS} ${PERL_INC} -I${HL_INC}
+	${CXX} ${CXXFLAGS} ${LDFLAGS} -shared -s highlight_wrap.o  -L${HL_SRC} -lhighlight ${LUA_LIBS} -lperl -o highlight.so
 
 php: lib-stamp
-	swig -c++ -php -o highlight_wrap.cpp highlight.i
-	${CXX} ${CFLAGS} -c highlight_wrap.cpp ${LUA_CFLAGS} ${PHP_INC} -I${HL_INC}
-	${CXX} -shared -s highlight_wrap.o -L${HL_SRC} -lhighlight ${LUA_LIBS} -o highlight.so
+	swig3.0 -c++ -php -o highlight_wrap.cpp highlight.i
+	${CXX} ${CFLAGS} ${LDFLAGS} -c highlight_wrap.cpp ${LUA_CFLAGS} ${PHP_INC} -I${HL_INC}
+	${CXX} ${CXXFLAGS} ${LDFLAGS} -shared -s highlight_wrap.o -L${HL_SRC} -lhighlight ${LUA_LIBS} -lphp -o highlight.so
 
 clean: python-clean perl-clean php-clean
 	rm -f *-stamp