Date: Wed, 1 Jan 2014 21:54:47 GMT From: Stephen Hurd <shurd@sasktel.net> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/185398: Fix comms/xmorse build with Clang Message-ID: <201401012154.s01LsldE001043@oldred.freebsd.org> Resent-Message-ID: <201401012200.s01M00p1027707@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 185398
>Category: ports
>Synopsis: Fix comms/xmorse build with Clang
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Jan 01 22:00:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Stephen Hurd
>Release: 10.0-RC3
>Organization:
>Environment:
FreeBSD portable 10.0-RC3 FreeBSD 10.0-RC3 #0 r259778: Mon Dec 23 23:27:58 UTC 2013 root@snap.freebsd.org:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
comms/xmorse has hardcoded compiler names. Switch to ${CC} and ${CXX} works fine.
>How-To-Repeat:
Build without GCC installed
>Fix:
New patch-Makefile attached.
Patch attached with submission follows:
--- Makefile.orig 2004-09-29 15:12:16.000000000 -0700
+++ Makefile 2014-01-01 08:57:44.000000000 -0800
@@ -9,12 +9,12 @@
m.exe: m.fl Bargraph.cxx Bargraph.h Codebox.cxx Codebox.h Cw.cxx Cw.h \
Knob.cxx Knob.h Help.h m.fl
fluid -c m.fl
- g++ -c -Os `fltk-config --cxxflags` m.cxx
- g++ -c -Os `fltk-config --cxxflags` Bargraph.cxx
- g++ -c -Os `fltk-config --cxxflags` Codebox.cxx
- g++ -c -Os `fltk-config --cxxflags` Knob.cxx
- g++ -c -Os -I/usr/local/include/SDL Cw.cxx
- g++ -om.exe m.o Bargraph.o Codebox.o Cw.o Knob.o \
+ ${CXX} -c -Os `fltk-config --cxxflags` m.cxx
+ ${CXX} -c -Os `fltk-config --cxxflags` Bargraph.cxx
+ ${CXX} -c -Os `fltk-config --cxxflags` Codebox.cxx
+ ${CXX} -c -Os `fltk-config --cxxflags` Knob.cxx
+ ${CXX} -c -Os -I/usr/local/include/SDL Cw.cxx
+ ${CXX} -om.exe m.o Bargraph.o Codebox.o Cw.o Knob.o \
-static `fltk-config --ldstaticflags` \
-lSDL -lmingw32 -lmingwex -lwinmm -lSDLmain
strip m.exe
@@ -25,24 +25,43 @@
m: m.fl Bargraph.cxx Bargraph.h Codebox.cxx Codebox.h Cw.cxx Cw.h \
Knob.cxx Knob.h Help.h m.fl
fluid -c m.fl
- g++ -c -Os `fltk-config --cxxflags` m.cxx
- g++ -c -Os `fltk-config --cxxflags` Bargraph.cxx
- g++ -c -Os `fltk-config --cxxflags` Codebox.cxx
- g++ -c -Os `fltk-config --cxxflags` Knob.cxx
- g++ -c -Os `sdl-config --cflags` Cw.cxx
- g++ -static -om m.o Bargraph.o Codebox.o Cw.o Knob.o \
+ ${CXX} -c -Os `fltk-config --cxxflags` m.cxx
+ ${CXX} -c -Os `fltk-config --cxxflags` Bargraph.cxx
+ ${CXX} -c -Os `fltk-config --cxxflags` Codebox.cxx
+ ${CXX} -c -Os `fltk-config --cxxflags` Knob.cxx
+ ${CXX} -c -Os `sdl-config --cflags` Cw.cxx
+ ${CXX} -static -om m.o Bargraph.o Codebox.o Cw.o Knob.o \
`sdl-config --static-libs` \
`fltk-config --ldstaticflags` -ldl
strip m
rm *.o m.cxx m.h
+# Regular "make" is what you want for the FreeBSD version
+
+all: m.fl Bargraph.cxx Bargraph.h Codebox.cxx Codebox.h Cw.cxx Cw.h \
+ Knob.cxx Knob.h Help.h m.fl
+ fluid -c m.fl
+ ${CXX} -c -Os `fltk-config --cxxflags` m.cxx
+ ${CXX} -c -Os `fltk-config --cxxflags` Bargraph.cxx
+ ${CXX} -c -Os `fltk-config --cxxflags` Codebox.cxx
+ ${CXX} -c -Os `fltk-config --cxxflags` Knob.cxx
+ ${CXX} -c -Os `sdl-config --cflags` Cw.cxx
+ ${CXX} -om m.o Bargraph.o Codebox.o Cw.o Knob.o \
+ `sdl-config --static-libs` \
+ `fltk-config --ldstaticflags`
+ strip m
+ rm *.o m.cxx m.h
+
+install: m
+ ${INSTALL} -o root -g wheel -m 0555 m ${PREFIX}/bin/xmorse
+
# Besemer's Python extension version
cw.so: cw.pyx Cw.cxx Cw.h
pyrexc cw.pyx
- gcc -c -fPIC -I/usr/include/python2.3 cw.c
- gcc -c -fPIC `sdl-config --cflags` Cw.cxx
- g++ -shared cw.o Cw.o -static `sdl-config --static-libs` -ocw.so
+ ${CC} -c -fPIC -I/usr/include/python2.3 cw.c
+ ${CC} -c -fPIC `sdl-config --cflags` Cw.cxx
+ ${CXX} -shared cw.o Cw.o -static `sdl-config --static-libs` -ocw.so
rm cw.c *.o
Help.h: m.htm
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401012154.s01LsldE001043>