Commit: 024349436cd0efbd1972455b48050cd6a541a913 - phabrics (git)

Commit MetaInfo

• Révision: 024349436cd0efbd1972455b48050cd6a541a913 (tree)
• l'heure: 2022-04-18 20:35:47
• Auteur: phabrics <phabrics@phab...>
• Commiter: phabrics

Message de Log

Fix modules dependency issues in preparation for parallel builds.

Change Summary

• modified: contrib/tme-0.8/Makefile.am
• modified: contrib/tme-0.8/configure.ac
• modified: contrib/tme-0.8/host/gtk/gtk-screen.c
• modified: contrib/tme-0.8/modules
• add: contrib/tme-0.8/tme-preopen.txt
• modified: contrib/tme-0.8/tmesh/Makefile.am

Modification

--- a/contrib/tme-0.8/Makefile.am
+++ b/contrib/tme-0.8/Makefile.am
@@ -25,3 +25,10 @@ pkgdata_DATA = tmeconfig.h tmememory.h
 dist-hook:
 	rm -f ${distdir}/libtme/recode-host.c
 	find $(distdir)/edist -name CVS -a -exec rm -r {} ';' -a -prune
+
+# The target to update the list of modules to preopen on platforms that don't support dlopen.
+# This will update this list to be automatically included by automake
+# so that future builds will track all module dependencies.
+# If new modules are added, "make modules" must be run to update this list in the source.
+modules-local:
+	echo -n LDADD = > $(top_srcdir)/tme-preopen.txt 

--- a/contrib/tme-0.8/configure.ac
+++ b/contrib/tme-0.8/configure.ac
@@ -42,6 +42,7 @@ AC_CANONICAL_TARGET
 #AC_CONFIG_MACRO_DIR([libltdl/m4])
 AC_CONFIG_LIBOBJ_DIR([lib])
 AM_INIT_AUTOMAKE([subdir-objects])
+AM_EXTRA_RECURSIVE_TARGETS([modules])
 AM_PROG_CC_C_O
 AC_PREFIX_PROGRAM([tmesh])
 
@@ -1163,11 +1164,7 @@ LT_INIT([dlopen,win32-dll])
 LT_LANG([Windows Resource])
 LTDL_INIT([recursive installable])
 CPPFLAGS="${CPPFLAGS-} ${LTDLINCL}"
-TME_PREOPEN=
-if test "x${enable_static}" = "xyes"; then
-  TME_PREOPEN='`sort -u $(top_builddir)/tme-preopen.txt`'
-fi
-AC_SUBST(TME_PREOPEN)
+AM_CONDITIONAL([USING_PREOPEN], [test "x${enable_static}" = "xyes"])
 
 AC_ARG_VAR([IFCONFIG], [full path to ipconfig utility])
 AC_ARG_VAR([ROUTE], [full path to route utility])

--- a/contrib/tme-0.8/host/gtk/gtk-screen.c
+++ b/contrib/tme-0.8/host/gtk/gtk-screen.c
@@ -561,8 +561,12 @@ TME_ELEMENT_SUB_NEW_DECL(tme_host_gtk,display) {
 
   gdk_monitor_get_workarea(display->tme_gdk_display_monitor, &workarea);
 
-  if(workarea.width) display->display.tme_screen_width = workarea.width;
-  if(workarea.height) display->display.tme_screen_height = workarea.height;
+  if(GDK_IS_MONITOR(display->tme_gdk_display_monitor) &&
+     workarea.width &&
+     workarea.height) {
+    display->display.tme_screen_width = workarea.width;    
+    display->display.tme_screen_height = workarea.height;
+  }
 
   /* set the display-specific functions: */
   display->display.tme_display_bell = _tme_gtk_display_bell;

--- a/contrib/tme-0.8/modules
+++ b/contrib/tme-0.8/modules
@@ -35,7 +35,7 @@
 # build modules.  it updates the modules index that will be installed
 # along with all of the modules, and also handles some static building
 # details.  this is done with an all-local target:
-all-local:
+
 #
 # first, all source files in the current directory are searched for
 # element "new" function declarations.  these declarations provide
@@ -53,6 +53,7 @@ all-local:
 # this is abuse of the $(top_builddir)/tme directory, yes, since
 # this directory was originally just for include files and to make
 # #include <tme/FOO.h> work right when building:
+install-exec-local:
 	@echo updating tme modules list..
 	@grep TME_ELEMENT_NEW_DECL $(srcdir)/*.c |		\
 	sed -e 's%.*TME_ELEMENT_NEW_DECL(\(.*\)).*%\1%'		\
@@ -63,6 +64,7 @@ all-local:
 	@grep TME_ELEMENT_X_NEW_DECL $(srcdir)/*.c |		\
 	sed -e 's%.*TME_ELEMENT_X_NEW_DECL(\(.*\),\(.*\),\(.*\)).*%\1\3 \1\2 \3%' \
 	>> $(top_builddir)/tme/tme-plugins.txt
+
 #
 # next, when building statically, either for debugging purposes or
 # because we're on a weak platform, we have to use libtool's "preopen"
@@ -82,6 +84,16 @@ all-local:
 # else it will substitute the empty string.  when linking programs,
 # @TME_PREOPEN@ is then used on the program's link command line.
 # 
+# Note: this works differently now - please see comment in top Makefile for modules target
+modules-local:
+	@if test "x$(pkglib_LTLIBRARIES)" != x; then		\
+	    for module in $(pkglib_LTLIBRARIES); do		\
+		echo $$module ;					\
+		echo " \\" >> $(top_srcdir)/tme-preopen.txt ; \
+		echo -ne "\t-dlopen ../$(subdir)/$$module" >> $(top_srcdir)/tme-preopen.txt ; \
+	    done ;						\
+	fi
+
 # additionally, libtool, at least through version 1.5, has a
 # limitation in that the pseudo-library (the .la file) must be present
 # even for a preloaded module.  if we aren't debugging, everything is
@@ -95,10 +107,10 @@ all-local:
 # module.c can find the uninstalled tme-plugins.txt file, and libtool
 # will want to look in this directory for .la files, so we simply copy
 # all of the .la files into that same directory:
+all-local:
 	@if test "x$(pkglib_LTLIBRARIES)" != x; then		\
 	    for module in $(pkglib_LTLIBRARIES); do		\
 		echo $$module ;					\
-		echo -dlopen ../$(subdir)/$$module >> $(top_builddir)/tme-preopen.txt ; \
 		cp $$module $(top_builddir)/tme ;		\
 	    done ;						\
 	fi

--- /dev/null
+++ b/contrib/tme-0.8/tme-preopen.txt
@@ -0,0 +1,33 @@
+LDADD = \
+	-dlopen ../generic/tme_generic.la \
+	-dlopen ../ic/m68k/tme_ic_m68k.la \
+	-dlopen ../ic/sparc/tme_ic_sparc.la \
+	-dlopen ../ic/stp22xx/tme_ic_stp22xx.la \
+	-dlopen ../ic/tme_ic_am9513.la \
+	-dlopen ../ic/tme_ic_mm58167.la \
+	-dlopen ../ic/tme_ic_z8530.la \
+	-dlopen ../ic/tme_ic_i825x6.la \
+	-dlopen ../ic/tme_ic_isil7170.la \
+	-dlopen ../ic/tme_ic_ncr5380.la \
+	-dlopen ../ic/tme_ic_am7930.la \
+	-dlopen ../ic/tme_ic_am7990.la \
+	-dlopen ../ic/tme_ic_ncr53c9x.la \
+	-dlopen ../ic/tme_ic_mk48txx.la \
+	-dlopen ../ic/tme_ic_lsi64854.la \
+	-dlopen ../ic/tme_ic_nec765.la \
+	-dlopen ../ic/tme_ic_ncr89c105.la \
+	-dlopen ../ic/tme_ic_stp2024.la \
+	-dlopen ../ic/tme_ic_ad184x.la \
+	-dlopen ../machine/sun2/tme_machine_sun2.la \
+	-dlopen ../machine/sun3/tme_machine_sun3.la \
+	-dlopen ../machine/sun4/tme_machine_sun4.la \
+	-dlopen ../host/posix/tme_host_posix.la \
+	-dlopen ../host/bsd/tme_host_bsd.la \
+	-dlopen ../host/tun/tme_host_tun.la \
+	-dlopen ../host/openvpn/tme_host_openvpn.la \
+	-dlopen ../host/rfb/tme_host_rfb.la \
+	-dlopen ../host/gtk/tme_host_gtk.la \
+	-dlopen ../bus/multibus/tme_bus_multibus.la \
+	-dlopen ../bus/sbus/tme_bus_sbus.la \
+	-dlopen ../serial/tme_serial_kb.la \
+	-dlopen ../scsi/tme_scsi.la
\ No newline at end of file

--- a/contrib/tme-0.8/tmesh/Makefile.am
+++ b/contrib/tme-0.8/tmesh/Makefile.am
@@ -19,8 +19,9 @@ libtmesh_la_SOURCES = \
 libtmesh_la_LIBADD = $(top_builddir)/libtme/libtme.la
 
 bin_PROGRAMS = tmesh
-tmesh_LDADD = libtmesh.la
-tmesh_LDFLAGS = -dlpreopen force -dlopen self @TME_PREOPEN@
+tmesh_LDADD = libtmesh.la $(LDADD)
+tmesh_LDFLAGS = -dlpreopen force -dlopen self
+include $(top_srcdir)/tme-preopen.txt
 
 install-exec-hook:
 	$(SETCAP) $(DESTDIR)$(bindir)/$(TGTPFX)tmesh$(EXEEXT)