freetype-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[freetype2-demos] master 8e9447b: [graph] Fix build with `slibtool`.


From: Werner Lemberg
Subject: [freetype2-demos] master 8e9447b: [graph] Fix build with `slibtool`.
Date: Wed, 24 Mar 2021 02:36:44 -0400 (EDT)

branch: master
commit 8e9447b32dae7e6c95bee3f878ee1877f9b628a4
Author: orbea <orbea@riseup.net>
Commit: Werner Lemberg <wl@gnu.org>

    [graph] Fix build with `slibtool`.
    
    * graph/rules.mk (GRAPH_LIB): Handle the case specially where
    `LIBTOOL` is defined.
    (COMPILE_GRAPH_LIB) <LIBTOOL>: Enable use of `dlopen`.
---
 ChangeLog      | 8 ++++++++
 graph/rules.mk | 5 +++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fa6f62c..57c145a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2021-03-24  orbea  <orbea@riseup.net>
+
+       [graph] Fix build with `slibtool`.
+
+       * graph/rules.mk (GRAPH_LIB): Handle the case specially where
+       `LIBTOOL` is defined.
+       (COMPILE_GRAPH_LIB) <LIBTOOL>: Enable use of `dlopen`.
+
 2021-03-18  Alexei Podtelezhnikov  <apodtele@gmail.com>
 
        [ftbench] Add Windows performance timers.
diff --git a/graph/rules.mk b/graph/rules.mk
index 4903a38..a3f0de1 100644
--- a/graph/rules.mk
+++ b/graph/rules.mk
@@ -12,7 +12,6 @@
 
 
 GRAPH_INCLUDES := $(subst /,$(COMPILER_SEP),$(TOP_DIR_2)/graph)
-GRAPH_LIB      := $(OBJ_DIR_2)/graph.$(SA)
 
 GRAPH := $(TOP_DIR_2)/graph
 
@@ -46,9 +45,11 @@ GRAPH_OBJS := $(OBJ_DIR_2)/gblblit.$(O)   \
 # this value can be modified by the system-specific graphics drivers.
 #
 ifneq ($(LIBTOOL),)
-  COMPILE_GRAPH_LIB = $(LIBTOOL) --mode=link $(CCraw) -static \
+  GRAPH_LIB        := $(OBJ_DIR_2)/graph.$(A)
+  COMPILE_GRAPH_LIB = $(LIBTOOL) --mode=link $(CCraw) -module -static \
                                  -o $(subst /,$(COMPILER_SEP),$@ $(GRAPH_OBJS))
 else
+  GRAPH_LIB        := $(OBJ_DIR_2)/graph.$(SA)
   COMPILE_GRAPH_LIB = ar -r $(subst /,$(COMPILER_SEP),$@ $(GRAPH_OBJS))
 endif
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]