[DO-981] qt package (!15)
Co-authored-by: aleksandr.vodyanov <aleksandr.vodyanov@avroid.tech> Reviewed-on: https://git.avroid.tech/Conan/conan_build/pulls/15
This commit is contained in:
@@ -0,0 +1,39 @@
|
||||
--- a/src/Makefile.shlib
|
||||
+++ b/src/Makefile.shlib
|
||||
@@ -358,7 +358,10 @@ else
|
||||
# Win32 case
|
||||
|
||||
# See notes in src/backend/parser/Makefile about the following two rules
|
||||
-$(stlib): $(shlib)
|
||||
+$(stlib): $(OBJS) | $(SHLIB_PREREQS)
|
||||
+ rm -f $@
|
||||
+ $(LINK.static) $@ $^
|
||||
+ $(RANLIB) $@
|
||||
touch $@
|
||||
|
||||
# XXX A backend that loads a module linked with libgcc_s_dw2-1.dll will exit
|
||||
@@ -371,12 +374,12 @@ $(stlib): $(shlib)
|
||||
# Else we just use --export-all-symbols.
|
||||
ifeq (,$(SHLIB_EXPORTS))
|
||||
$(shlib): $(OBJS) | $(SHLIB_PREREQS)
|
||||
- $(CC) $(CFLAGS) -shared -static-libgcc -o $@ $(OBJS) $(LDFLAGS) $(LDFLAGS_SL) $(SHLIB_LINK) $(LIBS) -Wl,--export-all-symbols -Wl,--out-implib=$(stlib)
|
||||
+ $(CC) $(CFLAGS) -shared -static-libgcc -o $@ $(OBJS) $(LDFLAGS) $(LDFLAGS_SL) $(SHLIB_LINK) $(LIBS) -Wl,--export-all-symbols -Wl,--out-implib=lib$(NAME).dll.a
|
||||
else
|
||||
DLL_DEFFILE = lib$(NAME)dll.def
|
||||
|
||||
$(shlib): $(OBJS) $(DLL_DEFFILE) | $(SHLIB_PREREQS)
|
||||
- $(CC) $(CFLAGS) -shared -static-libgcc -o $@ $(OBJS) $(DLL_DEFFILE) $(LDFLAGS) $(LDFLAGS_SL) $(SHLIB_LINK) $(LIBS) -Wl,--out-implib=$(stlib)
|
||||
+ $(CC) $(CFLAGS) -shared -static-libgcc -o $@ $(OBJS) $(DLL_DEFFILE) $(LDFLAGS) $(LDFLAGS_SL) $(SHLIB_LINK) $(LIBS) -Wl,--out-implib=lib$(NAME).dll.a
|
||||
|
||||
UC_NAME = $(shell echo $(NAME) | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ')
|
||||
|
||||
@@ -452,6 +455,9 @@ endif # not aix
|
||||
ifneq (,$(findstring $(PORTNAME),win32 cygwin))
|
||||
$(INSTALL_SHLIB) $< '$(DESTDIR)$(bindir)/$(shlib)'
|
||||
endif
|
||||
+ifneq (,$(findstring $(PORTNAME),win32))
|
||||
+ $(INSTALL_SHLIB) $< '$(DESTDIR)$(libdir)/lib$(NAME).dll.a'
|
||||
+endif
|
||||
else # no soname
|
||||
$(INSTALL_SHLIB) $< '$(DESTDIR)$(pkglibdir)/$(shlib)'
|
||||
endif
|
||||
Reference in New Issue
Block a user