diff options
Diffstat (limited to 'cad/kicad-devel/files/patch-libs.FreeBSD')
-rw-r--r-- | cad/kicad-devel/files/patch-libs.FreeBSD | 106 |
1 files changed, 0 insertions, 106 deletions
diff --git a/cad/kicad-devel/files/patch-libs.FreeBSD b/cad/kicad-devel/files/patch-libs.FreeBSD deleted file mode 100644 index 8d935b6a79d4..000000000000 --- a/cad/kicad-devel/files/patch-libs.FreeBSD +++ /dev/null @@ -1,106 +0,0 @@ ---- libs.FreeBSD.orig Sat Jan 27 00:07:38 2007 -+++ libs.FreeBSD Sat Jan 27 00:08:36 2007 -@@ -1,6 +1,6 @@ - - #Configuration for build kicad --KICAD_BIN = /usr/local/kicad/FreeBSD -+KICAD_BIN = ${PREFIX}/kicad/FreeBSD - - - SRCSUFF = .cpp -@@ -11,26 +11,31 @@ - # You must comment or uncomment this line for dynamic or static link - # dynamic link is less difficult than static link - # choose it if you have problems (libs not found, or unresolved references) ), or if kicad is running only on YOUR system. --KICAD_STATIC_LINK = 1 -+#KICAD_STATIC_LINK = 1 - - # path and version definition for wxWidgets and mesa libs --MESALIBSPATH = /usr/local/lib --WXPATH = `wx-config --prefix`/lib --PREFIX_WX_LIBS = lib`wx-config --basename` --SUFFIX_WX_LIBSTD = `wx-config --utility=` -+MESALIBSPATH = ${LOCALBASE}/lib -+WXPATH = `${WX_CONFIG} --prefix`/lib -+ifdef KICAD_STATIC_LINK -+PREFIX_WX_LIBS = lib`${WX_CONFIG} --basename` - SUFFIX_WX_LIBGL = _gl-$(LIBVERSION).a -+else -+PREFIX_WX_LIBS = `${WX_CONFIG} --basename` -+SUFFIX_WX_LIBGL = _gl-$(LIBVERSION) -+endif -+#SUFFIX_WX_LIBSTD = `${WX_CONFIG} --utility=` - - # Use static link for libstdc++.a (sometimes also libsupc++.a) - # locate libstdc++.a and copy it in kicad_dev/syslibs - ifdef KICAD_STATIC_LINK - #define path for a copy of libstdc++.a or/and libsupc++.a: --LIBSTDC = ../syslibs/libstdc++.a -+LIBSTDC = /usr/lib/libstdc++.a - else - # Or Use static link for libsupc++ or libstdc++ (more easy!!) - LIBSTDC = -lstdc++ - endif - --LIBVERSION=`wx-config --release` -+LIBVERSION=`${WX_CONFIG} --release` - - # use link static for wxWidgets - ifdef KICAD_STATIC_LINK -@@ -38,11 +43,11 @@ - $(MESALIBSPATH)/libGL.a $(MESALIBSPATH)/libGLU.a - - WXSYSLIB= $(WXPATH)/$(PREFIX_WX_LIBS)-$(LIBVERSION).a \ -- $(WXPATH)/libwxpng-$(LIBVERSION).a\ -- $(WXPATH)/libwxjpeg-$(LIBVERSION).a\ -- $(WXPATH)/libwxzlib-$(LIBVERSION).a\ -- /usr/X11R6/lib/libXinerama.a \ -- /usr/X11R6/lib/libXxf86vm.a \ -+ -lpng\ -+ -ljpeg\ -+ -lz\ -+ ${X11BASE}/lib/libXinerama.a \ -+ ${X11BASE}/lib/libXxf86vm.a \ - -lgtk-x11-2.0 -lgdk-x11-2.0 \ - -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lgthread-2.0\ - -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl\ -@@ -51,12 +56,12 @@ - - - WXSYSLIB_WITH_GL= $(WXPATH)/$(PREFIX_WX_LIBS)-$(LIBVERSION).a \ -- $(WXPATH)/libwxpng-$(LIBVERSION).a\ -- $(WXPATH)/libwxjpeg-$(LIBVERSION).a\ -- $(WXPATH)/libwxzlib-$(LIBVERSION).a\ -+ -lpng\ -+ -ljpeg\ -+ -lz\ - $(LIBS3D)\ -- /usr/X11R6/lib/libXinerama.a \ -- /usr/X11R6/lib/libXxf86vm.a \ -+ ${X11BASE}/lib/libXinerama.a \ -+ ${X11BASE}/lib/libXxf86vm.a \ - -lgtk-x11-2.0 -lgdk-x11-2.0 \ - -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lgthread-2.0\ - -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl\ -@@ -64,16 +69,16 @@ - -L/usr/lib - else - #or use "standard command" for wxWidgets --WXSYSLIB= `wx-config --libs std` --WXSYSLIB_WITH_GL= `wx-config --libs std,gl` -+WXSYSLIB= `${WX_CONFIG} --libs` -+WXSYSLIB_WITH_GL= `${WX_CONFIG} --libs std,gl` - endif - - --# attention à l'ordre des libairies --LIBS = -L/usr/local/lib -L/usr/X11R6/lib\ -+# attention à l'ordre des librairies -+LIBS = -L${LOCALBASE}/lib -L${X11BASE}/lib\ - $(EXTRALIBS) $(WXSYSLIB)\ - $(LIBSTDC) - --LIBS_WITH_GL = -L/usr/local/lib -L/usr/X11R6/lib\ -+LIBS_WITH_GL = -L${LOCALBASE}/lib -L${X11BASE}/lib\ - $(EXTRALIBS) $(WXSYSLIB_WITH_GL)\ - $(LIBSTDC) |