diff options
| author | Kris Kennaway <kris@FreeBSD.org> | 2002-09-09 01:01:26 +0000 |
|---|---|---|
| committer | Kris Kennaway <kris@FreeBSD.org> | 2002-09-09 01:01:26 +0000 |
| commit | a508c32fd1af4389b38005a84f7652975f473511 (patch) | |
| tree | 475deedb3ace1af0d3c91679b97d252acb42d5e0 /russian | |
| parent | Fix build on -current (build/link C++ code with ${CXX}) (diff) | |
Fix build in -current (build/link C++ code with ${CXX})
Notes
Notes:
svn path=/head/; revision=65870
Diffstat (limited to 'russian')
| -rw-r--r-- | russian/xcyrBGR/Makefile | 2 | ||||
| -rw-r--r-- | russian/xcyrBGR/files/patch-ab | 26 |
2 files changed, 27 insertions, 1 deletions
diff --git a/russian/xcyrBGR/Makefile b/russian/xcyrBGR/Makefile index 5d39ea1c3a66..ad59c3ecab16 100644 --- a/russian/xcyrBGR/Makefile +++ b/russian/xcyrBGR/Makefile @@ -19,7 +19,7 @@ NO_INSTALL_MANPAGES= yes .include <bsd.port.pre.mk> .if ${OSVERSION} >= 400012 -MAKE_ENV= COPT="-fpermissive" +MAKE_ENV= COPT="${CXXFLAGS} -fpermissive" .endif post-extract: diff --git a/russian/xcyrBGR/files/patch-ab b/russian/xcyrBGR/files/patch-ab new file mode 100644 index 000000000000..dfe07a78a239 --- /dev/null +++ b/russian/xcyrBGR/files/patch-ab @@ -0,0 +1,26 @@ +--- Makefile.orig Sun Sep 8 17:09:50 2002 ++++ Makefile Sun Sep 8 17:10:42 2002 +@@ -1,18 +1,19 @@ + I = -I${X11BASE}/include -I${LOCALBASE}/include + L = -L${LOCALBASE}/lib -L${X11BASE}/lib -L/usr/lib -lXpm -lX11 -lXext + +-CC+= ${CFLAGS} ${COPT} $I -DXLIB_ILLEGAL_ACCESS ++CXX?= c++ ++CXXFLAGS=${COPT} $I -DXLIB_ILLEGAL_ACCESS + + all: xcyrBGR + + xcyrBGR: xcyrBGR.o cyrmapper.o +- $(CC) xcyrBGR.o cyrmapper.o -o xcyrBGR $L ++ $(CXX) $(CXXFLAGS) xcyrBGR.o cyrmapper.o -o xcyrBGR $L + + xcyrBGR.o: xcyrBGR.cc +- $(CC) xcyrBGR.cc -c -o xcyrBGR.o ++ $(CXX) $(CXXFLAGS) xcyrBGR.cc -c -o xcyrBGR.o + + cyrmapper.o: cyrmapper.cc cyrmapper.h +- $(CC) cyrmapper.cc -c -o cyrmapper.o ++ $(CXX) $(CXXFLAGS) cyrmapper.cc -c -o cyrmapper.o + + clean: + rm *.o xcyrBGR |