On 04/27/16 04:05 PM, Michael Niedermayer wrote:
On Tue, Apr 26, 2016 at 06:15:26PM +0300, Dmitriy Kuminov wrote:
On 2016-04-26 11:51:28 +0000, KO Myung-Hun said:
However, ln_s is always set to 'cp -f' on OS/2. Please remove ln_s
overriding codes as well.
Yes, but my initial patch already removes this override (check the
first hunk) so just applying it + Dave's should get it all done.
which patches exactly should be applied ?
Reattached to avoid confusion.
Thanks,
Dave
From 68addec570bcc9db6f37232523c724e66c004149 Mon Sep 17 00:00:00 2001
From: Dmitriy Kuminov <coding@dmik.org>
Date: Thu, 14 Apr 2016 01:45:01 +0400
Subject: [PATCH 1/2] configure: Do not create/install versioned DLLs on OS/2.
Only one DLL for each module must be present on OS/2: SLIBNAME_WITH_MAJOR
(the same as on Windows). Creating other DLLs makes no sense as they can't
be used.
Signed-off-by: Dave Yeo <daveryeo@telus.net>
---
configure | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/configure b/configure
index ef0b689..c96b845 100755
--- a/configure
+++ b/configure
@@ -4716,7 +4716,6 @@ case $target_os in
;;
os/2*)
strip="lxlite -CS"
- ln_s="cp -f"
objformat="aout"
add_cppflags -D_GNU_SOURCE
add_ldflags -Zomf -Zbin-files -Zargs-wild -Zmap
@@ -4724,16 +4723,18 @@ case $target_os in
LIBSUF="_s.a"
SLIBPREF=""
SLIBSUF=".dll"
- SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME)-$(LIBVERSION)$(SLIBSUF)'
- SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(shell echo $(NAME) | cut -c1-6)$(LIBMAJOR)$(SLIBSUF)'
- SLIB_CREATE_DEF_CMD='echo LIBRARY $(SLIBNAME_WITH_MAJOR) INITINSTANCE TERMINSTANCE > $(SUBDIR)$(NAME).def; \
- echo CODE PRELOAD MOVEABLE DISCARDABLE >> $(SUBDIR)$(NAME).def; \
- echo DATA PRELOAD MOVEABLE MULTIPLE NONSHARED >> $(SUBDIR)$(NAME).def; \
- echo EXPORTS >> $(SUBDIR)$(NAME).def; \
- emxexp $(OBJS) >> $(SUBDIR)$(NAME).def'
- SLIB_EXTRA_CMD='emximp -o $(SUBDIR)$(LIBPREF)$(NAME)_dll.a $(SUBDIR)$(NAME).def; \
- emximp -o $(SUBDIR)$(LIBPREF)$(NAME)_dll.lib $(SUBDIR)$(NAME).def;'
- SLIB_INSTALL_EXTRA_LIB='$(LIBPREF)$(NAME)_dll.a $(LIBPREF)$(NAME)_dll.lib'
+ SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)'
+ SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(shell echo $(FULLNAME) | cut -c1-6)$(LIBMAJOR)$(SLIBSUF)'
+ SLIB_CREATE_DEF_CMD='echo LIBRARY $(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=) INITINSTANCE TERMINSTANCE > $(SUBDIR)$(FULLNAME).def; \
+ echo CODE PRELOAD MOVEABLE DISCARDABLE >> $(SUBDIR)$(FULLNAME).def; \
+ echo DATA PRELOAD MOVEABLE MULTIPLE NONSHARED >> $(SUBDIR)$(FULLNAME).def; \
+ echo EXPORTS >> $(SUBDIR)$(FULLNAME).def; \
+ emxexp $(OBJS) >> $(SUBDIR)$(FULLNAME).def'
+ SLIB_EXTRA_CMD='emximp -o $(SUBDIR)$(LIBPREF)$(FULLNAME)_dll.a $(SUBDIR)$(FULLNAME).def; \
+ emximp -o $(SUBDIR)$(LIBPREF)$(FULLNAME)_dll.lib $(SUBDIR)$(FULLNAME).def;'
+ SLIB_INSTALL_NAME='$(SLIBNAME_WITH_MAJOR)'
+ SLIB_INSTALL_LINKS=
+ SLIB_INSTALL_EXTRA_LIB='$(LIBPREF)$(FULLNAME)_dll.a $(LIBPREF)$(FULLNAME)_dll.lib'
enable dos_paths
enable_weak os2threads
;;
--
2.0.0
From 341e82add973c1ff54f93b0eca7278d5958e6b55 Mon Sep 17 00:00:00 2001
From: Dave Yeo <daveryeo@telus.net>
Date: Mon, 25 Apr 2016 07:39:08 -0700
Subject: [PATCH 2/2] configure: Allow choice in choosing a symlink command
Signed-off-by: Dave Yeo <daveryeo@telus.net>
---
configure | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index c96b845..d75ff04 100755
--- a/configure
+++ b/configure
@@ -314,6 +314,7 @@ Toolchain options:
--nm=NM use nm tool NM [$nm_default]
--ar=AR use archive tool AR [$ar_default]
--as=AS use assembler AS [$as_default]
+ --ln_s=LN_S use symbolic link tool LN_S [$ln_s_default]
--strip=STRIP use strip tool STRIP [$strip_default]
--windres=WINDRES use windows resource compiler WINDRES [$windres_default]
--yasmexe=EXE use yasm-compatible assembler EXE [$yasmexe_default]
@@ -2137,6 +2138,7 @@ CMDLINE_SET="
host_os
install
ld
+ ln_s
logfile
malloc_prefix
nm
@@ -3078,7 +3080,7 @@ host_cc_default="gcc"
cp_f="cp -f"
doxygen_default="doxygen"
install="install"
-ln_s="ln -s -f"
+ln_s_default="ln -s -f"
nm_default="nm -g"
objformat="elf"
pkg_config_default=pkg-config
@@ -4001,7 +4003,7 @@ test -n "$cc_type" && enable $cc_type ||
: ${dep_cc_default:=$cc}
: ${ld_default:=$cc}
: ${host_ld_default:=$host_cc}
-set_default ar as objcc dep_cc ld host_ld windres
+set_default ar as objcc dep_cc ld ln_s host_ld windres
probe_cc as "$as"
asflags_filter=$_flags_filter
--
2.0.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
