view src/build-pkg-config-1-fixes.patch @ 4449:1933a9113e65

of-*: add octave as a dependancy to the of packages is binary enable is set (Bug #46235) * src/of-actuarial.mk, src/of-communications.mk, src/of-control.mk, src/of-data-smoothing.mk, src/of-database.mk, src/of-dataframe.mk, src/of-dicom.mk, src/of-financial.mk, src/of-fits.mk, src/of-fl-core.mk, src/of-fuzzy-logic-toolkit.mk, src/of-ga.mk, src/of-general.mk, src/of-generate_html.mk, src/of-geometry.mk, src/of-gsl.mk, src/of-image.mk, src/of-instrument-control.mk, src/of-interval.mk, src/of-io.mk, src/of-linear-algebra.mk, src/of-lssa.mk, src/of-ltfat.mk, src/of-mapping.mk, src/of-miscellaneous.mk, src/of-nan.mk, src/of-netcdf.mk, src/of-nurbs.mk, src/of-ocs.mk, src/of-octcdf.mk, src/of-odepkg.mk, src/of-optim.mk, src/of-quaternion.mk, src/of-queueing.mk, src/of-signal.mk, src/of-sockets.mk, src/of-sparsersb.mk, src/of-specfun.mk, src/of-splines.mk, src/of-statistics.mk, src/of-stk.mk, src/of-strings.mk, src/of-struct.mk, src/of-tisean.mk, src/of-tsa.mk, src/of-video.mk, src/of-windows.mk, src/of-zenity.mk, src/of-zeromq.mk: add $(PKG)_DEPS += $(OCTAVE_TARGET) if ENABLE_BINARY_PACKAGES = yes
author John D
date Mon, 14 Aug 2017 09:12:34 -0400
parents 706c4daf3372
children
line wrap: on
line source

diff -uNr a/main.c b/main.c
--- a/main.c	2013-01-22 08:11:53.000000000 -0500
+++ b/main.c	2013-06-10 13:16:55.637783224 -0400
@@ -287,29 +287,7 @@
 static void
 init_pc_path (void)
 {
-#ifdef G_OS_WIN32
-  char *instdir, *lpath, *shpath;
-
-  instdir = g_win32_get_package_installation_directory_of_module (NULL);
-  if (instdir == NULL)
-    {
-      /* This only happens when GetModuleFilename() fails. If it does, that
-       * failure should be investigated and fixed.
-       */
-      debug_spew ("g_win32_get_package_installation_directory_of_module failed\n");
-      return;
-    }
-
-  lpath = g_build_filename (instdir, "lib", "pkgconfig", NULL);
-  shpath = g_build_filename (instdir, "share", "pkgconfig", NULL);
-  pkg_config_pc_path = g_strconcat (lpath, G_SEARCHPATH_SEPARATOR_S, shpath,
-                                    NULL);
-  g_free (instdir);
-  g_free (lpath);
-  g_free (shpath);
-#else
   pkg_config_pc_path = PKG_CONFIG_PC_PATH;
-#endif
 }
 
 static gboolean
diff -uNr a/Makefile.am b/Makefile.am
--- a/Makefile.am	2013-01-23 14:07:39.000000000 -0500
+++ b/Makefile.am	2013-06-10 12:31:32.984044807 -0400
@@ -9,18 +9,10 @@
 SUBDIRS = $(GLIB_SUBDIR) . check
 DIST_SUBDIRS = $(SUBDIRS)
 
-# Escape paths properly on windows
-if NATIVE_WIN32
 AM_CPPFLAGS = \
 	-DPKG_CONFIG_PC_PATH="\"$(subst /,\/,$(pc_path))\"" \
 	-DPKG_CONFIG_SYSTEM_INCLUDE_PATH="\"$(subst /,\/,$(system_include_path))\"" \
 	-DPKG_CONFIG_SYSTEM_LIBRARY_PATH="\"$(subst /,\/,$(system_library_path))\""
-else
-AM_CPPFLAGS = \
-	-DPKG_CONFIG_PC_PATH="\"$(pc_path)\"" \
-	-DPKG_CONFIG_SYSTEM_INCLUDE_PATH="\"$(system_include_path)\"" \
-	-DPKG_CONFIG_SYSTEM_LIBRARY_PATH="\"$(system_library_path)\""
-endif
 
 AM_CFLAGS = \
 	$(WARN_CFLAGS) \