education/gamgi: set "-fcommon", update to 0.17.3g

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

education/gamgi: set "-fcommon", update to 0.17.3g

Klemens Nanni-2
http://www.gamgi.org/changelogs/changelogs.html

Repology lists a bunch of other Debian (based) distributions building
this tool, FreeBSD is not on the list, FWIW.

I went the easy way just like Debian did;  the update itself did not
change "-fno-common" behaviour, i.e. it's the same twenty files that
clash on the `gamgi' symbol.

gamgi starts fine and I can model basic things like orbitals, but that's
all I tested.

Feedback? OK?

Index: Makefile
===================================================================
RCS file: /cvs/ports/education/gamgi/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile 12 Jul 2019 20:46:07 -0000 1.21
+++ Makefile 19 Feb 2021 02:34:38 -0000
@@ -2,7 +2,7 @@
 
 COMMENT= General Atomistic Modelling Graphic Interface
 
-V= 0.15.5
+V= 0.17.3g
 DISTNAME= gamgi-all-${V}
 PKGNAME= ${DISTNAME:S/-all//}
 CATEGORIES= education x11
@@ -12,9 +12,14 @@ HOMEPAGE= http://www.gamgi.org/
 # GPLv2
 PERMIT_PACKAGE= Yes
 
-MASTER_SITES= ftp://ftp.gamgi.org/gamgi/src/
+MASTER_SITES= http://atom.ist.utl.pt/src/ \
+ http://gamgi.ist.utl.pt/src/ \
+ ftp://atom.ist.utl.pt/src/
 
 USE_GMAKE= Yes
+
+# avoid patching twenty occurence of "ld: error: duplicate symbol: gamgi"
+COPTS += -fcommon
 
 WANTLIB += GL GLU X11 Xext Xi Xmu atk-1.0 c cairo expat freetype
 WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 glib-2.0 gmodule-2.0 gobject-2.0
Index: distinfo
===================================================================
RCS file: /cvs/ports/education/gamgi/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo 18 Jan 2015 03:13:51 -0000 1.11
+++ distinfo 19 Feb 2021 02:13:35 -0000
@@ -1,2 +1,2 @@
-SHA256 (gamgi-all-0.15.5.tar.gz) = q0lT9RPQAJxOmr0pK+wRETscf7VLuCd7viod14WU7+Q=
-SIZE (gamgi-all-0.15.5.tar.gz) = 2180662
+SHA256 (gamgi-all-0.17.3g.tar.gz) = WkbgGhMU3mn77FhWyPbwQQnxUgNYD6bSX5cTJF5MzEw=
+SIZE (gamgi-all-0.17.3g.tar.gz) = 2575304
Index: patches/patch-src-make_local
===================================================================
RCS file: /cvs/ports/education/gamgi/patches/patch-src-make_local,v
retrieving revision 1.7
diff -u -p -r1.7 patch-src-make_local
--- patches/patch-src-make_local 29 Dec 2019 23:56:58 -0000 1.7
+++ patches/patch-src-make_local 19 Feb 2021 02:21:27 -0000
@@ -1,8 +1,11 @@
 $OpenBSD: patch-src-make_local,v 1.7 2019/12/29 23:56:58 ajacoutot Exp $
+
+Set include and library paths.
+
 Index: src/make_local
 --- src/make_local.orig
 +++ src/make_local
-@@ -70,29 +70,29 @@ PATH_GTKGL_L =-L/usr/lib
+@@ -80,29 +80,29 @@ PATH_GTKGL_L =-L/usr/lib
 
  #================================= OpenBSD =====================================
  #
@@ -14,11 +17,23 @@ Index: src/make_local
 -# PATH_PANGO_H = -I/usr/local/include/pango-2.0
 -# PATH_ATK_H = -I/usr/local/include/atk-2.0
 -# PATH_GTK_H =  -I/usr/local/include/gtk-2.0 -I/usr/local/lib/gtk-2.0/include \
--# -I/usr/include/gdk-pixbuf-2.0/
+-# -I/usr/include/gdk-pixbuf-2.0/
 -# PATH_MESA_H = -I/usr/X11R6/include/GL
 -# PATH_GTKGL_H = -I/usr/local/include/gtkglext-1.0 \
 -# -I/usr/local/lib/gtkglext-1.0/include
--#
++PATH_EXPAT_H = -I${X11BASE}/include
++PATH_FREETYPE_H = -I${X11BASE}/include/freetype2
++PATH_X_H = -I${X11BASE}/include
++PATH_GLIB_H = -I${LOCALBASE}/include/glib-2.0 -I${LOCALBASE}/lib/glib-2.0/include
++PATH_CAIRO_H = -I${LOCALBASE}/include/cairo
++PATH_PANGO_H = -I${LOCALBASE}/include/pango-1.0 -I${LOCALBASE}/include/harfbuzz
++PATH_ATK_H = -I${LOCALBASE}/include/atk-1.0
++PATH_GTK_H =  -I${LOCALBASE}/include/gtk-2.0 -I${LOCALBASE}/lib/gtk-2.0/include \
++ -I${LOCALBASE}/include/gdk-pixbuf-2.0
++PATH_MESA_H = -I${X11BASE}/include/GL
++PATH_GTKGL_H = -I${LOCALBASE}/include/gtkglext-1.0 \
++ -I${LOCALBASE}/lib/gtkglext-1.0/include
+ #
 -# PATH_EXPAT_L = -L/usr/X11R6/lib
 -# PATH_FREETYPE_L = -L/usr/X11R6/lib
 -# PATH_X_L = -L/usr/X11R6/lib
@@ -29,19 +44,6 @@ Index: src/make_local
 -# PATH_GTK_L = -L/usr/local/lib
 -# PATH_MESA_L = -L/usr/X11R6/lib
 -# PATH_GTKGL_L = -L/usr/local/lib
-+PATH_EXPAT_H = -I${X11BASE}/include
-+PATH_FREETYPE_H = -I${X11BASE}/include/freetype2
-+PATH_X_H = -I${X11BASE}/include
-+PATH_GLIB_H = -I${LOCALBASE}/include/glib-2.0 -I${LOCALBASE}/lib/glib-2.0/include
-+PATH_CAIRO_H = -I${LOCALBASE}/include/cairo
-+PATH_PANGO_H = -I${LOCALBASE}/include/pango-1.0
-+PATH_ATK_H = -I${LOCALBASE}/include/atk-1.0
-+PATH_GTK_H =  -I${LOCALBASE}/include/gtk-2.0 -I${LOCALBASE}/lib/gtk-2.0/include \
-+       -I${LOCALBASE}/include/gdk-pixbuf-2.0/ -I${LOCALBASE}/include/harfbuzz
-+PATH_MESA_H = -I${X11BASE}/include/GL
-+PATH_GTKGL_H = -I${LOCALBASE}/include/gtkglext-1.0 \
-+      -I${LOCALBASE}/lib/gtkglext-1.0/include/
-+
 +PATH_EXPAT_L = -L${X11BASE}/lib
 +PATH_FREETYPE_L = -L${X11BASE}/lib
 +PATH_X_L = -L${X11BASE}/lib
Index: patches/patch-src-make_rules
===================================================================
RCS file: /cvs/ports/education/gamgi/patches/patch-src-make_rules,v
retrieving revision 1.8
diff -u -p -r1.8 patch-src-make_rules
--- patches/patch-src-make_rules 1 Dec 2010 08:13:19 -0000 1.8
+++ patches/patch-src-make_rules 19 Feb 2021 02:18:33 -0000
@@ -1,20 +1,13 @@
 $OpenBSD: patch-src-make_rules,v 1.8 2010/12/01 08:13:19 jasper Exp $
---- src/make_rules.orig Tue Nov 30 23:44:32 2010
-+++ src/make_rules Tue Nov 30 23:47:52 2010
-@@ -17,6 +17,7 @@ SHELL=/bin/sh
- CC ?= gcc
-
- CFLAGS ?= -O3 -Wall -ansi
-+override CFLAGS += `pkg-config --cflags gdk-pixbuf-2.0` -pthread
- #override CFLAGS += -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED \
- # -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED \
- # -DGSEAL_ENABLE \
-@@ -37,7 +38,7 @@ EXE = gamgi
- LIBS = -lgtkglext-x11-1.0 -lgdkglext-x11-1.0 -lGLU -lGL -lgtk-x11-2.0 \
- -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 \
- -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 \
-- -lXext -lX11 -lXi -lXmu -lfreetype -lexpat -lm -ldl
-+ -lXext -lX11 -lXi -lXmu -lfreetype -lexpat -lm -pthread
+Index: src/make_rules
+--- src/make_rules.orig
++++ src/make_rules
+@@ -37,7 +37,7 @@ EXE = gamgi
+ LIBS = -lgtkglext-x11-1.0 -lgdkglext-x11-1.0 \
+ -lGLU -lGL -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 \
+ -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 \
+- -lglib-2.0 -lXext -lX11 -lXi -lXmu -lfreetype -lexpat -lm -ldl
++ -lglib-2.0 -lXext -lX11 -lXi -lXmu -lfreetype -lexpat -lm -lpthread
 
  #================================ full paths ===============================
 
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/education/gamgi/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- pkg/PLIST 28 Sep 2011 16:45:17 -0000 1.7
+++ pkg/PLIST 19 Feb 2021 02:12:00 -0000
@@ -16,6 +16,8 @@ share/doc/gamgi/changelogs/changelogs12.
 share/doc/gamgi/changelogs/changelogs13.html
 share/doc/gamgi/changelogs/changelogs14.html
 share/doc/gamgi/changelogs/changelogs15.html
+share/doc/gamgi/changelogs/changelogs16.html
+share/doc/gamgi/changelogs/changelogs17.html
 share/doc/gamgi/code/
 share/doc/gamgi/code/architecture.html
 share/doc/gamgi/code/libraries.html
@@ -42,22 +44,31 @@ share/doc/gamgi/formats/assembly/
 share/doc/gamgi/formats/assembly/create_view.html
 share/doc/gamgi/formats/atom/
 share/doc/gamgi/formats/atom/config.html
-share/doc/gamgi/formats/atom/create.html
+share/doc/gamgi/formats/atom/create_analysis.html
+share/doc/gamgi/formats/atom/create_position.html
+share/doc/gamgi/formats/atom/create_property.html
+share/doc/gamgi/formats/atom/create_type.html
+share/doc/gamgi/formats/atom/create_view.html
 share/doc/gamgi/formats/bond/
 share/doc/gamgi/formats/bond/config_length.html
 share/doc/gamgi/formats/bond/config_view.html
-share/doc/gamgi/formats/bond/create_mode.html
+share/doc/gamgi/formats/bond/create_property.html
 share/doc/gamgi/formats/bond/create_type.html
 share/doc/gamgi/formats/bond/create_view.html
 share/doc/gamgi/formats/cell/
+share/doc/gamgi/formats/cell/config.html
 share/doc/gamgi/formats/cell/create_origin.html
 share/doc/gamgi/formats/cell/create_position.html
 share/doc/gamgi/formats/cell/create_symmetry.html
-share/doc/gamgi/formats/cell/create_type.html
 share/doc/gamgi/formats/cell/create_view.html
+share/doc/gamgi/formats/cell/create_volume.html
 share/doc/gamgi/formats/cluster/
+share/doc/gamgi/formats/cluster/create_position.html
+share/doc/gamgi/formats/cluster/create_scope.html
+share/doc/gamgi/formats/cluster/create_type.html
 share/doc/gamgi/formats/cluster/create_view.html
 share/doc/gamgi/formats/direction/
+share/doc/gamgi/formats/direction/create_position.html
 share/doc/gamgi/formats/direction/create_projection.html
 share/doc/gamgi/formats/direction/create_scope.html
 share/doc/gamgi/formats/direction/create_type.html
@@ -72,6 +83,9 @@ share/doc/gamgi/formats/gamgi/config_usa
 share/doc/gamgi/formats/graph/
 share/doc/gamgi/formats/graph/create_view.html
 share/doc/gamgi/formats/group/
+share/doc/gamgi/formats/group/create_position.html
+share/doc/gamgi/formats/group/create_scope.html
+share/doc/gamgi/formats/group/create_type.html
 share/doc/gamgi/formats/group/create_view.html
 share/doc/gamgi/formats/help/
 share/doc/gamgi/formats/help/config_agent.html
@@ -110,8 +124,13 @@ share/doc/gamgi/formats/light/create_typ
 share/doc/gamgi/formats/molecule/
 share/doc/gamgi/formats/molecule/create_view.html
 share/doc/gamgi/formats/orbital/
+share/doc/gamgi/formats/orbital/create_position.html
+share/doc/gamgi/formats/orbital/create_scope.html
+share/doc/gamgi/formats/orbital/create_type.html
 share/doc/gamgi/formats/orbital/create_view.html
+share/doc/gamgi/formats/orbital/create_volume.html
 share/doc/gamgi/formats/plane/
+share/doc/gamgi/formats/plane/create_position.html
 share/doc/gamgi/formats/plane/create_projection.html
 share/doc/gamgi/formats/plane/create_scope.html
 share/doc/gamgi/formats/plane/create_type.html
@@ -171,6 +190,7 @@ share/doc/gamgi/interfaces/atom/
 share/doc/gamgi/interfaces/atom/config.html
 share/doc/gamgi/interfaces/atom/config_analysis.html
 share/doc/gamgi/interfaces/atom/config_element.html
+share/doc/gamgi/interfaces/atom/config_global.html
 share/doc/gamgi/interfaces/atom/config_view.html
 share/doc/gamgi/interfaces/atom/copy_object.html
 share/doc/gamgi/interfaces/atom/copy_shift.html
@@ -196,8 +216,8 @@ share/doc/gamgi/interfaces/bond/
 share/doc/gamgi/interfaces/bond/config_length.html
 share/doc/gamgi/interfaces/bond/config_view.html
 share/doc/gamgi/interfaces/bond/create_length.html
-share/doc/gamgi/interfaces/bond/create_method.html
 share/doc/gamgi/interfaces/bond/create_property.html
+share/doc/gamgi/interfaces/bond/create_type.html
 share/doc/gamgi/interfaces/bond/create_view.html
 share/doc/gamgi/interfaces/bond/link_object.html
 share/doc/gamgi/interfaces/bond/link_shift.html
@@ -206,6 +226,10 @@ share/doc/gamgi/interfaces/bond/modify_v
 share/doc/gamgi/interfaces/bond/remove_object.html
 share/doc/gamgi/interfaces/bond/select_list.html
 share/doc/gamgi/interfaces/cell/
+share/doc/gamgi/interfaces/cell/config_global.html
+share/doc/gamgi/interfaces/cell/config_origin.html
+share/doc/gamgi/interfaces/cell/config_view.html
+share/doc/gamgi/interfaces/cell/config_volume.html
 share/doc/gamgi/interfaces/cell/copy_object.html
 share/doc/gamgi/interfaces/cell/copy_shift.html
 share/doc/gamgi/interfaces/cell/create_origin.html
@@ -260,6 +284,7 @@ share/doc/gamgi/interfaces/direction/lin
 share/doc/gamgi/interfaces/direction/link_shift.html
 share/doc/gamgi/interfaces/direction/measure_angle.html
 share/doc/gamgi/interfaces/direction/measure_length.html
+share/doc/gamgi/interfaces/direction/modify_position.html
 share/doc/gamgi/interfaces/direction/modify_projection.html
 share/doc/gamgi/interfaces/direction/modify_scope.html
 share/doc/gamgi/interfaces/direction/modify_type.html
@@ -286,7 +311,6 @@ share/doc/gamgi/interfaces/group/copy_ob
 share/doc/gamgi/interfaces/group/copy_shift.html
 share/doc/gamgi/interfaces/group/create_polytope.html
 share/doc/gamgi/interfaces/group/create_scope.html
-share/doc/gamgi/interfaces/group/create_tolerance.html
 share/doc/gamgi/interfaces/group/create_type.html
 share/doc/gamgi/interfaces/group/create_view.html
 share/doc/gamgi/interfaces/group/geometry.html
@@ -298,8 +322,8 @@ share/doc/gamgi/interfaces/group/measure
 share/doc/gamgi/interfaces/group/measure_view.html
 share/doc/gamgi/interfaces/group/measure_voronoi.html
 share/doc/gamgi/interfaces/group/modify_polytope.html
+share/doc/gamgi/interfaces/group/modify_position.html
 share/doc/gamgi/interfaces/group/modify_scope.html
-share/doc/gamgi/interfaces/group/modify_tolerance.html
 share/doc/gamgi/interfaces/group/modify_type.html
 share/doc/gamgi/interfaces/group/modify_view.html
 share/doc/gamgi/interfaces/group/remove_object.html
@@ -351,7 +375,7 @@ share/doc/gamgi/interfaces/layer/remove_
 share/doc/gamgi/interfaces/layer/select_list.html
 share/doc/gamgi/interfaces/light/
 share/doc/gamgi/interfaces/light/config_color.html
-share/doc/gamgi/interfaces/light/config_materials.html
+share/doc/gamgi/interfaces/light/config_global.html
 share/doc/gamgi/interfaces/light/copy_object.html
 share/doc/gamgi/interfaces/light/copy_shift.html
 share/doc/gamgi/interfaces/light/create_attenuation.html
@@ -381,6 +405,21 @@ share/doc/gamgi/interfaces/molecule/sele
 share/doc/gamgi/interfaces/molecule/symmetry.html
 share/doc/gamgi/interfaces/molecule/voronoi.html
 share/doc/gamgi/interfaces/orbital/
+share/doc/gamgi/interfaces/orbital/copy_object.html
+share/doc/gamgi/interfaces/orbital/copy_shift.html
+share/doc/gamgi/interfaces/orbital/create_position.html
+share/doc/gamgi/interfaces/orbital/create_scope.html
+share/doc/gamgi/interfaces/orbital/create_type.html
+share/doc/gamgi/interfaces/orbital/create_view.html
+share/doc/gamgi/interfaces/orbital/create_volume.html
+share/doc/gamgi/interfaces/orbital/link_object.html
+share/doc/gamgi/interfaces/orbital/link_shift.html
+share/doc/gamgi/interfaces/orbital/modify_position.html
+share/doc/gamgi/interfaces/orbital/modify_scope.html
+share/doc/gamgi/interfaces/orbital/modify_type.html
+share/doc/gamgi/interfaces/orbital/modify_view.html
+share/doc/gamgi/interfaces/orbital/modify_volume.html
+share/doc/gamgi/interfaces/orbital/remove_object.html
 share/doc/gamgi/interfaces/orbital/select.html
 share/doc/gamgi/interfaces/plane/
 share/doc/gamgi/interfaces/plane/copy_object.html
@@ -394,6 +433,7 @@ share/doc/gamgi/interfaces/plane/link_sh
 share/doc/gamgi/interfaces/plane/measure_angle.html
 share/doc/gamgi/interfaces/plane/measure_area.html
 share/doc/gamgi/interfaces/plane/measure_length.html
+share/doc/gamgi/interfaces/plane/modify_position.html
 share/doc/gamgi/interfaces/plane/modify_projection.html
 share/doc/gamgi/interfaces/plane/modify_scope.html
 share/doc/gamgi/interfaces/plane/modify_type.html
@@ -456,6 +496,7 @@ share/doc/gamgi/project/history.html
 share/doc/gamgi/project/jcgp.html
 share/doc/gamgi/project/legal_copyright.html
 share/doc/gamgi/project/legal_license.html
+share/doc/gamgi/project/legal_patents.html
 share/doc/gamgi/project/legal_trademark.html
 share/doc/gamgi/project/legal_warranty.html
 share/doc/gamgi/project/links_legal.html
@@ -524,16 +565,22 @@ share/gamgi/cell/Al_M/Al7Cr.xml
 share/gamgi/cell/Al_M/Al7Cr_bw.xml
 share/gamgi/cell/Al_M/screen_Al4Cr_ab_abc.xml
 share/gamgi/cell/Al_M/screen_Al5Mo_h_r.xml
-share/gamgi/cell/blenda.xml
-share/gamgi/cell/calcite_solid.xml
-share/gamgi/cell/calcite_wired.xml
+share/gamgi/cell/etc/
+share/gamgi/cell/etc/berilo.xml
+share/gamgi/cell/etc/blenda.xml
+share/gamgi/cell/etc/calcite.xml
+share/gamgi/cell/etc/calcite_solid.xml
+share/gamgi/cell/etc/calcite_wired.xml
+share/gamgi/cell/etc/fluorapatite.txt
+share/gamgi/cell/etc/fluorapatite.xml
+share/gamgi/cell/etc/olivina.xml
+share/gamgi/cell/etc/screen_YBa2Cu3O7-x.xml
+share/gamgi/cell/etc/screen_blenda.xml
+share/gamgi/cell/etc/sodalite.xml
+share/gamgi/cell/glasses/
+share/gamgi/cell/glasses/rcp100.xml
 share/gamgi/cell/interstices/
-share/gamgi/cell/interstices/ccc_oct.xml
-share/gamgi/cell/interstices/ccc_tet.xml
-share/gamgi/cell/interstices/cfc_oct.xml
-share/gamgi/cell/interstices/cfc_tet.xml
-share/gamgi/cell/interstices/hc_oct.xml
-share/gamgi/cell/interstices/hc_tet.xml
+share/gamgi/cell/interstices/polyhedra.xml
 share/gamgi/cell/interstices/solid.xml
 share/gamgi/cell/interstices/wired.xml
 share/gamgi/cell/link/
@@ -545,13 +592,123 @@ share/gamgi/cell/link/link5.xml
 share/gamgi/cell/link/link6.xml
 share/gamgi/cell/link/link7.xml
 share/gamgi/cell/link/link8.xml
-share/gamgi/cell/olivina.xml
+share/gamgi/cell/martensite/
+share/gamgi/cell/martensite/martensite_bain.xml
+share/gamgi/cell/martensite/martensite_kurdjumov.xml
+share/gamgi/cell/martensite/martensite_nishiyama.xml
 share/gamgi/cell/polymers/
 share/gamgi/cell/polymers/o-HDPE.xml
 share/gamgi/cell/polymers/o-HDPE_screen.xml
-share/gamgi/cell/rcp100.xml
-share/gamgi/cell/screen_blenda.xml
+share/gamgi/cell/silica/
+share/gamgi/cell/silica/cristobalite.txt
+share/gamgi/cell/silica/cristobalite.xml
+share/gamgi/cell/silica/quartz.txt
+share/gamgi/cell/silica/quartz.xml
+share/gamgi/cell/silica/trydimite.txt
+share/gamgi/cell/silica/trydimite.xml
 share/gamgi/cell/structures/
+share/gamgi/cell/structures/README
+share/gamgi/cell/structures/s001_Cu_cfc.txt
+share/gamgi/cell/structures/s001_Cu_cfc.xml
+share/gamgi/cell/structures/s002_W_bcc.txt
+share/gamgi/cell/structures/s002_W_bcc.xml
+share/gamgi/cell/structures/s003_Mg_hcp.txt
+share/gamgi/cell/structures/s003a_Mg_hcp.xml
+share/gamgi/cell/structures/s003b_Mg_hcp.xml
+share/gamgi/cell/structures/s003c_inversion.xml
+share/gamgi/cell/structures/s004_AuCu.txt
+share/gamgi/cell/structures/s004_AuCu.xml
+share/gamgi/cell/structures/s005_AuCu3.txt
+share/gamgi/cell/structures/s005_AuCu3.xml
+share/gamgi/cell/structures/s006_C_diamond.txt
+share/gamgi/cell/structures/s006_C_diamond.xml
+share/gamgi/cell/structures/s007_NaCl.txt
+share/gamgi/cell/structures/s007a_NaCl.xml
+share/gamgi/cell/structures/s007b_NaCl.xml
+share/gamgi/cell/structures/s007c_NaCl.xml
+share/gamgi/cell/structures/s008_BiF3.txt
+share/gamgi/cell/structures/s008a_BiF3.xml
+share/gamgi/cell/structures/s008b_BiF3.xml
+share/gamgi/cell/structures/s009_AlCu2Mn_heusler.txt
+share/gamgi/cell/structures/s009a_AlCu2Mn_heusler.xml
+share/gamgi/cell/structures/s009b_AlCu2Mn_heusler.xml
+share/gamgi/cell/structures/s010_CsCl.txt
+share/gamgi/cell/structures/s010_CsCl.xml
+share/gamgi/cell/structures/s011_ZnS_blenda.txt
+share/gamgi/cell/structures/s011_ZnS_blenda.xml
+share/gamgi/cell/structures/s012_CaF2_fluorite.txt
+share/gamgi/cell/structures/s012_CaF2_fluorite.xml
+share/gamgi/cell/structures/s013_CuFeS2_chalcopyrite.txt
+share/gamgi/cell/structures/s013_CuFeS2_chalcopyrite.xml
+share/gamgi/cell/structures/s014_ZnS_wurtzite.txt
+share/gamgi/cell/structures/s014_ZnS_wurtzite.xml
+share/gamgi/cell/structures/s015_NiAs.txt
+share/gamgi/cell/structures/s015a_NiAs.xml
+share/gamgi/cell/structures/s015b_NiAs.xml
+share/gamgi/cell/structures/s016_Ni3Sn.txt
+share/gamgi/cell/structures/s016a_Ni3Sn.xml
+share/gamgi/cell/structures/s016b_Ni3Sn.xml
+share/gamgi/cell/structures/s017_aLa.txt
+share/gamgi/cell/structures/s017_aLa.xml
+share/gamgi/cell/structures/s018_bSn.txt
+share/gamgi/cell/structures/s018_bSn.xml
+share/gamgi/cell/structures/s019_In.txt
+share/gamgi/cell/structures/s019_In.xml
+share/gamgi/cell/structures/s020_As.txt
+share/gamgi/cell/structures/s020_As.xml
+share/gamgi/cell/structures/s021_gSe.txt
+share/gamgi/cell/structures/s021a_gSe.xml
+share/gamgi/cell/structures/s021b_gSe.xml
+share/gamgi/cell/structures/s022_C_graphite.txt
+share/gamgi/cell/structures/s022_C_graphite.xml
+share/gamgi/cell/structures/s023_aHg.txt
+share/gamgi/cell/structures/s023_aHg.xml
+share/gamgi/cell/structures/s024_Ga.txt
+share/gamgi/cell/structures/s024a_Ga.xml
+share/gamgi/cell/structures/s024b_Ga.xml
+share/gamgi/cell/structures/s025_aMn.txt
+share/gamgi/cell/structures/s025_aMn.xml
+share/gamgi/cell/structures/s026_bMn.txt
+share/gamgi/cell/structures/s026_bMn.xml
+share/gamgi/cell/structures/s027_aU.txt
+share/gamgi/cell/structures/s027_aU.xml
+share/gamgi/cell/structures/s028_Al3Ti.txt
+share/gamgi/cell/structures/s028_Al3Ti.xml
+share/gamgi/cell/structures/s029_Cr3Si.txt
+share/gamgi/cell/structures/s029_Cr3Si.xml
+share/gamgi/cell/structures/s030_Al3Zr4.txt
+share/gamgi/cell/structures/s030_Al3Zr4.xml
+share/gamgi/cell/structures/s032_Cu2Mg_laves.txt
+share/gamgi/cell/structures/s032_Cu2Mg_laves.xml
+share/gamgi/cell/structures/s033_MgZn2_laves.txt
+share/gamgi/cell/structures/s033_MgZn2_laves.xml
+share/gamgi/cell/structures/s034_MgNi2_laves.txt
+share/gamgi/cell/structures/s034_MgNi2_laves.xml
+share/gamgi/cell/structures/s043_AuBe5.txt
+share/gamgi/cell/structures/s043_AuBe5.xml
+share/gamgi/cell/structures/s047_CaCu5.txt
+share/gamgi/cell/structures/s047_CaCu5.xml
+share/gamgi/cell/structures/s055_Fe3C.txt
+share/gamgi/cell/structures/s055_Fe3C.xml
+share/gamgi/cell/structures/s056_Fe2B.txt
+share/gamgi/cell/structures/s056_Fe2B.xml
+share/gamgi/cell/structures/s058_Al2O3_corundum.txt
+share/gamgi/cell/structures/s058_Al2O3_corundum.xml
+share/gamgi/cell/structures/s059_CatiO3.txt
+share/gamgi/cell/structures/s059_CatiO3.xml
+share/gamgi/cell/structures/s060_MgAl2O4_spinel.txt
+share/gamgi/cell/structures/s060a_MgAl2O4_spinel.xml
+share/gamgi/cell/structures/s060b_MgAl2O4_spinel.xml
+share/gamgi/cell/structures/s060c_MgAl2O4_spinel.xml
+share/gamgi/cell/structures/s061_CdI2.txt
+share/gamgi/cell/structures/s061_CdI2.xml
+share/gamgi/cell/structures/s062_TiO2_rutile.txt
+share/gamgi/cell/structures/s062a_TiO2_rutile.xml
+share/gamgi/cell/structures/s062b_TiO2_rutile.xml
+share/gamgi/cell/structures/s065_ZnWO4.txt
+share/gamgi/cell/structures/s065_ZnWO4.xml
+share/gamgi/cell/structures/s098_SiO2_bquartz.txt
+share/gamgi/cell/structures/s098_SiO2_bquartz.xml
 share/gamgi/cell/structures/s103_Ice_Ic.txt
 share/gamgi/cell/structures/s103_Ice_Ic.xml
 share/gamgi/cell/structures/s104_CO2_cubic.txt
@@ -560,70 +717,67 @@ share/gamgi/cell/structures/s105_C6H6.tx
 share/gamgi/cell/structures/s105_C6H6.xml
 share/gamgi/cell/structures/s106_C8O46_ice_clathrate.txt
 share/gamgi/cell/structures/s106_C8O46_ice_clathrate.xml
-share/gamgi/cell/structures/s10_CsCl.txt
-share/gamgi/cell/structures/s10_CsCl.xml
-share/gamgi/cell/structures/s11_ZnS_blenda.txt
-share/gamgi/cell/structures/s11_ZnS_blenda.xml
-share/gamgi/cell/structures/s12_CaF2_fluorite.txt
-share/gamgi/cell/structures/s12_CaF2_fluorite.xml
-share/gamgi/cell/structures/s13_CuFeS2_chalcopyrite.txt
-share/gamgi/cell/structures/s13_CuFeS2_chalcopyrite.xml
-share/gamgi/cell/structures/s14_ZnS_wurtzite.txt
-share/gamgi/cell/structures/s14_ZnS_wurtzite.xml
-share/gamgi/cell/structures/s15_NiAs.txt
-share/gamgi/cell/structures/s15a_NiAs.xml
-share/gamgi/cell/structures/s15b_NiAs.xml
-share/gamgi/cell/structures/s16_Ni3Sn.txt
-share/gamgi/cell/structures/s16a_Ni3Sn.xml
-share/gamgi/cell/structures/s16b_Ni3Sn.xml
-share/gamgi/cell/structures/s17_aLa.txt
-share/gamgi/cell/structures/s17_aLa.xml
-share/gamgi/cell/structures/s18_bSn.txt
-share/gamgi/cell/structures/s18_bSn.xml
-share/gamgi/cell/structures/s19_In.txt
-share/gamgi/cell/structures/s19_In.xml
-share/gamgi/cell/structures/s1_Cu_cfc.txt
-share/gamgi/cell/structures/s1_Cu_cfc.xml
-share/gamgi/cell/structures/s20_As.txt
-share/gamgi/cell/structures/s20_As.xml
-share/gamgi/cell/structures/s21_gSe.txt
-share/gamgi/cell/structures/s21a_gSe.xml
-share/gamgi/cell/structures/s21b_gSe.xml
-share/gamgi/cell/structures/s22_C_graphite.txt
-share/gamgi/cell/structures/s22_C_graphite.xml
-share/gamgi/cell/structures/s23_aHg.txt
-share/gamgi/cell/structures/s23_aHg.xml
-share/gamgi/cell/structures/s24_Ga.txt
-share/gamgi/cell/structures/s24a_Ga.xml
-share/gamgi/cell/structures/s24b_Ga.xml
-share/gamgi/cell/structures/s2_W_bcc.txt
-share/gamgi/cell/structures/s2_W_bcc.xml
-share/gamgi/cell/structures/s3_Mg_hcp.txt
-share/gamgi/cell/structures/s3a_Mg_hcp.xml
-share/gamgi/cell/structures/s3b_Mg_hcp.xml
-share/gamgi/cell/structures/s4_AuCu.txt
-share/gamgi/cell/structures/s4_AuCu.xml
-share/gamgi/cell/structures/s5_AuCu3.txt
-share/gamgi/cell/structures/s5_AuCu3.xml
-share/gamgi/cell/structures/s6_C_diamond.txt
-share/gamgi/cell/structures/s6_C_diamond.xml
-share/gamgi/cell/structures/s7_NaCl.txt
-share/gamgi/cell/structures/s7a_NaCl.xml
-share/gamgi/cell/structures/s7b_NaCl.xml
-share/gamgi/cell/structures/s7c_NaCl.xml
-share/gamgi/cell/structures/s8_BiF3.txt
-share/gamgi/cell/structures/s8a_BiF3.xml
-share/gamgi/cell/structures/s8b_BiF3.xml
-share/gamgi/cell/structures/s9_AlCu2Mn_heusler.txt
-share/gamgi/cell/structures/s9a_AlCu2Mn_heusler.xml
-share/gamgi/cell/structures/s9b_AlCu2Mn_heusler.xml
 share/gamgi/cell/styles.xml
 share/gamgi/cell/styles_bw.xml
 share/gamgi/cell/superconductors/
-share/gamgi/cell/superconductors/screen_yba2cu3o7.xml
-share/gamgi/cell/superconductors/yba2cu3o6.xml
-share/gamgi/cell/superconductors/yba2cu3o7.xml
-share/gamgi/cell/superconductors/yba2cu3o7_structure.txt
+share/gamgi/cell/superconductors/README
+share/gamgi/cell/superconductors/s01_La2CuO4.txt
+share/gamgi/cell/superconductors/s01a_La2CuO4.xml
+share/gamgi/cell/superconductors/s01b_La2CuO4.xml
+share/gamgi/cell/superconductors/s02_Nd2CuO4-x.txt
+share/gamgi/cell/superconductors/s02a_Nd2CuO4-x.xml
+share/gamgi/cell/superconductors/s02b_Nd2CuO4-x.xml
+share/gamgi/cell/superconductors/s03_Nd2CuO4.txt
+share/gamgi/cell/superconductors/s03a_Nd2CuO4.xml
+share/gamgi/cell/superconductors/s03b_Nd2CuO4.xml
+share/gamgi/cell/superconductors/s04_HgBa2CuO4+x.txt
+share/gamgi/cell/superconductors/s04a_HgBa2CuO4+x.xml
+share/gamgi/cell/superconductors/s04b_HgBa2CuO4+x.xml
+share/gamgi/cell/superconductors/s05_PbEu2Sr2Cu2O9.txt
+share/gamgi/cell/superconductors/s05a_PbEu2Sr2Cu2O9.xml
+share/gamgi/cell/superconductors/s05b_PbEu2Sr2Cu2O9.xml
+share/gamgi/cell/superconductors/s06_Eu2Ba2Cu3O10-x.txt
+share/gamgi/cell/superconductors/s06a_Eu2Ba2Cu3O10-x.xml
+share/gamgi/cell/superconductors/s06b_Eu2Ba2Cu3O10-x.xml
+share/gamgi/cell/superconductors/s07_TlCO3Sr4Cu2O7.txt
+share/gamgi/cell/superconductors/s07a_TlCO3Sr4Cu2O7.xml
+share/gamgi/cell/superconductors/s07b_TlCO3Sr4Cu2O7.xml
+share/gamgi/cell/superconductors/s08_Tl2Ba2CuO6.txt
+share/gamgi/cell/superconductors/s08a_Tl2Ba2CuO6.xml
+share/gamgi/cell/superconductors/s08b_Tl2Ba2CuO6.xml
+share/gamgi/cell/superconductors/s09_Bi2Sr2Gd2Cu2O10.txt
+share/gamgi/cell/superconductors/s09a_Bi2Sr2Gd2Cu2O10.xml
+share/gamgi/cell/superconductors/s09b_Bi2Sr2Gd2Cu2O10.xml
+share/gamgi/cell/superconductors/s10_Pb2Sr2Cu2O6.txt
+share/gamgi/cell/superconductors/s10a_Pb2Sr2Cu2O6.xml
+share/gamgi/cell/superconductors/s10b_Pb2Sr2Cu2O6.xml
+share/gamgi/cell/superconductors/s11_La2CaCu2O6.txt
+share/gamgi/cell/superconductors/s11a_La2CaCu2O6.xml
+share/gamgi/cell/superconductors/s11b_La2CaCu2O6.xml
+share/gamgi/cell/superconductors/s12_TlBa2CaCu2O7-x.txt
+share/gamgi/cell/superconductors/s12a_TlBa2CaCu2O7-x.xml
+share/gamgi/cell/superconductors/s12b_TlBa2CaCu2O7-x.xml
+share/gamgi/cell/superconductors/s13_YBa2Cu3O7-x.txt
+share/gamgi/cell/superconductors/s13a_YBa2Cu3O7-x.xml
+share/gamgi/cell/superconductors/s13b_YBa2Cu3O7-x.xml
+share/gamgi/cell/superconductors/s14_Tl2Ba2CaCu2O8.txt
+share/gamgi/cell/superconductors/s14a_Tl2Ba2CaCu2O8.xml
+share/gamgi/cell/superconductors/s14b_Tl2Ba2CaCu2O8.xml
+share/gamgi/cell/superconductors/s17_Pb2Sr2YCu3O8.txt
+share/gamgi/cell/superconductors/s17a_Pb2Sr2YCu3O8.xml
+share/gamgi/cell/superconductors/s17b_Pb2Sr2YCu3O8.xml
+share/gamgi/cell/superconductors/s18_PbBaYSrCu3O8.txt
+share/gamgi/cell/superconductors/s18a_PbBaYSrCu3O8.xml
+share/gamgi/cell/superconductors/s18b_PbBaYSrCu3O8.xml
+share/gamgi/cell/superconductors/s19_TlBa2Ca2Cu3O9+x.txt
+share/gamgi/cell/superconductors/s19a_TlBa2Ca2Cu3O9+x.xml
+share/gamgi/cell/superconductors/s19b_TlBa2Ca2Cu3O9+x.xml
+share/gamgi/cell/superconductors/s25_Tl2Ba2Ca4Cu5O14.txt
+share/gamgi/cell/superconductors/s25a_Tl2Ba2Ca4Cu5O14.xml
+share/gamgi/cell/superconductors/s25b_Tl2Ba2Ca4Cu5O14.xml
+share/gamgi/cell/superconductors/s26_BaCuO2.txt
+share/gamgi/cell/superconductors/s26a_BaCuO2.xml
+share/gamgi/cell/superconductors/s26b_BaCuO2.xml
 share/gamgi/cell/tetragonal.xml
 share/gamgi/cluster/
 share/gamgi/cluster/H2O.xml
@@ -651,6 +805,8 @@ share/gamgi/gamgi/atom.xml
 share/gamgi/gamgi/document.xml
 share/gamgi/gamgi/document1.xml
 share/gamgi/gamgi/document2.xml
+share/gamgi/group/
+share/gamgi/group/group.xml
 share/gamgi/help/
 share/gamgi/help/config.xml
 share/gamgi/light/
@@ -700,6 +856,7 @@ share/gamgi/molecule/coordination/TiAnCl
 share/gamgi/molecule/coordination/VPyr3Cl3_m.xml
 share/gamgi/molecule/coordination/WCO6.xml
 share/gamgi/molecule/coordination/ZrCp3.xml
+share/gamgi/molecule/coordination/tiron.xml
 share/gamgi/molecule/coordination/vanadocene.xml
 share/gamgi/molecule/drugs/
 share/gamgi/molecule/drugs/README
@@ -789,6 +946,7 @@ share/gamgi/molecule/fullerenes/C96_D6h.
 share/gamgi/molecule/fullerenes/C98_D3.xml
 share/gamgi/molecule/fullerenes/README
 share/gamgi/molecule/glasses/
+share/gamgi/molecule/glasses/Nb2SiGe.xml
 share/gamgi/molecule/glasses/NbSiGe.xml
 share/gamgi/molecule/hydrocarbons/
 share/gamgi/molecule/hydrocarbons/README
@@ -819,23 +977,33 @@ share/gamgi/molecule/lipids/oleic.xml
 share/gamgi/molecule/lipids/palmitic.xml
 share/gamgi/molecule/lipids/stearic.xml
 share/gamgi/molecule/nanotubes/
+share/gamgi/molecule/nanotubes/1clustermn.xml
 share/gamgi/molecule/nanotubes/README
-share/gamgi/molecule/nanotubes/tube10_0.xml
-share/gamgi/molecule/nanotubes/tube10_10.xml
-share/gamgi/molecule/nanotubes/tube11_0.xml
-share/gamgi/molecule/nanotubes/tube12_0.xml
-share/gamgi/molecule/nanotubes/tube13_0.xml
-share/gamgi/molecule/nanotubes/tube14_0.xml
-share/gamgi/molecule/nanotubes/tube15_0.xml
-share/gamgi/molecule/nanotubes/tube16_0.xml
-share/gamgi/molecule/nanotubes/tube17_0.xml
-share/gamgi/molecule/nanotubes/tube18_0.xml
-share/gamgi/molecule/nanotubes/tube5_5.xml
-share/gamgi/molecule/nanotubes/tube6_6.xml
-share/gamgi/molecule/nanotubes/tube7_7.xml
-share/gamgi/molecule/nanotubes/tube8_8.xml
-share/gamgi/molecule/nanotubes/tube9_0.xml
-share/gamgi/molecule/nanotubes/tube9_9.xml
+share/gamgi/molecule/nanotubes/armchair_10_10.xml
+share/gamgi/molecule/nanotubes/armchair_2_2.xml
+share/gamgi/molecule/nanotubes/armchair_5_5.xml
+share/gamgi/molecule/nanotubes/armchair_6_6.xml
+share/gamgi/molecule/nanotubes/armchair_7_7.xml
+share/gamgi/molecule/nanotubes/armchair_8_8.xml
+share/gamgi/molecule/nanotubes/armchair_9_9.xml
+share/gamgi/molecule/nanotubes/chiral_10_5.xml
+share/gamgi/molecule/nanotubes/chiral_10_5_long.xml
+share/gamgi/molecule/nanotubes/chiral_10_5_multiple.xml
+share/gamgi/molecule/nanotubes/chiral_6_5.xml
+share/gamgi/molecule/nanotubes/chiral_7_5.xml
+share/gamgi/molecule/nanotubes/chiral_8_5.xml
+share/gamgi/molecule/nanotubes/chiral_9_5.xml
+share/gamgi/molecule/nanotubes/nanotubes.xml
+share/gamgi/molecule/nanotubes/zigzag_10_0.xml
+share/gamgi/molecule/nanotubes/zigzag_11_0.xml
+share/gamgi/molecule/nanotubes/zigzag_12_0.xml
+share/gamgi/molecule/nanotubes/zigzag_13_0.xml
+share/gamgi/molecule/nanotubes/zigzag_14_0.xml
+share/gamgi/molecule/nanotubes/zigzag_15_0.xml
+share/gamgi/molecule/nanotubes/zigzag_16_0.xml
+share/gamgi/molecule/nanotubes/zigzag_17_0.xml
+share/gamgi/molecule/nanotubes/zigzag_18_0.xml
+share/gamgi/molecule/nanotubes/zigzag_9_0.xml
 share/gamgi/molecule/nucleotides/
 share/gamgi/molecule/nucleotides/DNA.xml
 share/gamgi/molecule/photosynthesis/
@@ -912,6 +1080,11 @@ share/gamgi/molecule/sugars/l_glucose.xm
 share/gamgi/molecule/sugars/lactose.xml
 share/gamgi/molecule/sugars/maltose.xml
 share/gamgi/molecule/sugars/sucrose.xml
+share/gamgi/molecule/surfactants/
+share/gamgi/molecule/surfactants/all.xml
+share/gamgi/molecule/surfactants/c12e5.xml
+share/gamgi/molecule/surfactants/ctab.xml
+share/gamgi/molecule/surfactants/las.xml
 share/gamgi/molecule/symmetry/
 share/gamgi/molecule/symmetry/.xml
 share/gamgi/molecule/symmetry/C0v.xml
@@ -1050,11 +1223,15 @@ share/gamgi/molecule/symmetry/Td.xml
 share/gamgi/molecule/symmetry/Td_C28.xml
 share/gamgi/molecule/symmetry/Td_C476.xml
 share/gamgi/molecule/symmetry/Th.xml
-share/gamgi/molecule/tiron.xml
-share/gamgi/molecule/tiron_bw.xml
 share/gamgi/molecule/zeolites/
 share/gamgi/molecule/zeolites/Zeolite1.xml
 share/gamgi/molecule/zeolites/Zeolite2.xml
+share/gamgi/orbital/
+share/gamgi/orbital/6s_a.xml
+share/gamgi/orbital/6s_b.xml
+share/gamgi/orbital/screen_3d_all.xml
+share/gamgi/orbital/screen_6gz4_6s.xml
+share/gamgi/orbital/screen_6px.xml
 share/gamgi/plane/
 share/gamgi/plane/plane_cP001.xml
 share/gamgi/plane/plane_cP110.xml
@@ -1069,22 +1246,3 @@ share/gamgi/text/
 share/gamgi/text/fonts.xml
 share/gamgi/text/keyboard.xml
 share/gamgi/text/wired.xml
-share/gamgi/util/
-share/gamgi/util/c/
-share/gamgi/util/c/Cn.c
-share/gamgi/util/c/Cnh.c
-share/gamgi/util/c/Cnv.c
-share/gamgi/util/c/Dn.c
-share/gamgi/util/c/Dnd.c
-share/gamgi/util/c/Dnh.c
-share/gamgi/util/c/Sn.c
-share/gamgi/util/perl/
-share/gamgi/util/perl/car_gml
-share/gamgi/util/perl/cc1_gml
-share/gamgi/util/perl/debug_set_get
-share/gamgi/util/perl/dos_unix
-share/gamgi/util/perl/mac_unix
-share/gamgi/util/perl/mol_gml
-share/gamgi/util/perl/msf_gml
-share/gamgi/util/perl/pdb_gml
-share/gamgi/util/perl/xyz_gml

Reply | Threaded
Open this post in threaded view
|

Re: education/gamgi: set "-fcommon", update to 0.17.3g

Christian Weisgerber
Klemens Nanni:

> I went the easy way just like Debian did;  the update itself did not
> change "-fno-common" behaviour, i.e. it's the same twenty files that
> clash on the `gamgi' symbol.

That's a hint that it's defined in a header file that is included
everywhere.  You just need to mark it extern and copy the definition
into a *.c file.

> +# avoid patching twenty occurence of "ld: error: duplicate symbol: gamgi"
> +COPTS += -fcommon

It's never been quite clear to me how COPTS is to be used, but we
do not use it in the ports tree.

--
Christian "naddy" Weisgerber                          [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: education/gamgi: set "-fcommon", update to 0.17.3g

Klemens Nanni-2
On Fri, Feb 19, 2021 at 01:27:42PM +0100, Christian Weisgerber wrote:
> Klemens Nanni:
>
> > I went the easy way just like Debian did;  the update itself did not
> > change "-fno-common" behaviour, i.e. it's the same twenty files that
> > clash on the `gamgi' symbol.
>
> That's a hint that it's defined in a header file that is included
> everywhere.  You just need to mark it extern and copy the definition
> into a *.c file.
Right, but if I mark that symbol `extern' others now show up as well:

        $ make build 2>&1 | grep 'duplicate symbol'
        ld: error: duplicate symbol: gamgi_chem_property_color
        ld: error: duplicate symbol: gamgi_chem_property_ionic
        ld: error: duplicate symbol: gamgi_chem_property_ionic_driver
        ld: error: duplicate symbol: gamgi_chem_property_mass
        ld: error: duplicate symbol: gamgi_chem_property_mass_driver
        ld: error: duplicate symbol: gamgi_chem_property_radius
        ld: error: duplicate symbol: gamgi_phys_symmetry_driver_1
        ld: error: duplicate symbol: gamgi_phys_symmetry_driver_10
        ld: error: duplicate symbol: gamgi_phys_symmetry_driver_100
        ld: error: duplicate symbol: gamgi_phys_symmetry_driver_101
        ld: error: duplicate symbol: gamgi_phys_symmetry_driver_102
        ld: error: duplicate symbol: gamgi_phys_symmetry_driver_103
        ld: error: duplicate symbol: gamgi_phys_symmetry_driver_104
        ld: error: duplicate symbol: gamgi_phys_symmetry_driver_105
        ld: error: duplicate symbol: gamgi_phys_symmetry_driver_106
        ld: error: duplicate symbol: gamgi_phys_symmetry_driver_107
        ld: error: duplicate symbol: gamgi_phys_symmetry_driver_108
        ld: error: duplicate symbol: gamgi_phys_symmetry_driver_109
        ld: error: duplicate symbol: gamgi_phys_symmetry_driver_11
        ld: error: duplicate symbol: gamgi_phys_symmetry_driver_110

I don't want to patch all of those.


> > +# avoid patching twenty occurence of "ld: error: duplicate symbol: gamgi"
> > +COPTS += -fcommon
>
> It's never been quite clear to me how COPTS is to be used, but we
> do not use it in the ports tree.
bsd.port.mk(5) mentions `COPTS' just like `CFLAGS', would you want to
unmention it there?

Reply | Threaded
Open this post in threaded view
|

Re: education/gamgi: set "-fcommon", update to 0.17.3g

Christian Weisgerber
Klemens Nanni:

> > That's a hint that it's defined in a header file that is included
> > everywhere.  You just need to mark it extern and copy the definition
> > into a *.c file.
> Right, but if I mark that symbol `extern' others now show up as well:

I see.  There are a lot of tables that are defined in a handful of
*.c files and the declaration in the corresponding *.h files is
missing an "extern".  That's straightforward to fix...

> I don't want to patch all of those.

... but it affects 700 variables or so.  I guess -fcommon is the
pragmatic solution.

--
Christian "naddy" Weisgerber                          [hidden email]