Supporting the system was a nice joke for the 9 release, but it has
run its course. Nowadays Plan 9 receives no testing and has no
practical usefulness.
---
Makefile | 4 +--
compat/plan9/head | 10 --------
compat/plan9/main.c | 34 --------------------------
compat/plan9/printf | 2 --
configure | 18 +-------------
doc/platform.texi | 63 ------------------------------------------------
libavformat/os_support.h | 2 +-
library.mak | 2 +-
tests/checkasm/Makefile | 2 +-
9 files changed, 6 insertions(+), 131 deletions(-)
delete mode 100755 compat/plan9/head
delete mode 100644 compat/plan9/main.c
delete mode 100755 compat/plan9/printf
diff --git a/Makefile b/Makefile
index 8056cd3..cb5a88f 100644
--- a/Makefile
+++ b/Makefile
@@ -116,7 +116,7 @@ FF_STATIC_DEP_LIBS := $(STATIC_DEP_LIBS)
all: $(AVPROGS) alltools checkheaders examples testprogs
-$(TOOLS): %$(EXESUF): %.o $(EXEOBJS)
+$(TOOLS): %$(EXESUF): %.o
$(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS)
tools/cws2fws$(EXESUF): ELIBS = $(ZLIB)
@@ -157,7 +157,7 @@ $(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D))))
include $(SRC_PATH)/doc/Makefile
define DOPROG
-OBJS-$(1) += $(1).o $(EXEOBJS) $(OBJS-$(1)-yes)
+OBJS-$(1) += $(1).o $(OBJS-$(1)-yes)
$(1)$(EXESUF): $$(OBJS-$(1))
$$(OBJS-$(1)): CFLAGS += $(CFLAGS-$(1))
$(1)$(EXESUF): LDFLAGS += $(LDFLAGS-$(1))
diff --git a/compat/plan9/head b/compat/plan9/head
deleted file mode 100755
index 2840b2d..0000000
--- a/compat/plan9/head
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-n=10
-
-case "$1" in
- -n) n=$2; shift 2 ;;
- -n*) n=${1#-n}; shift ;;
-esac
-
-exec sed ${n}q "$@"
diff --git a/compat/plan9/main.c b/compat/plan9/main.c
deleted file mode 100644
index 97d7067..0000000
--- a/compat/plan9/main.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-int plan9_main(int argc, char **argv);
-
-#undef main
-int main(int argc, char **argv)
-{
- /* The setfcr() function in lib9 is broken, must use asm. */
-#ifdef __i386
- short fcr;
- __asm__ volatile ("fstcw %0 \n"
- "or $63, %0 \n"
- "fldcw %0 \n"
- : "=m"(fcr));
-#endif
-
- return plan9_main(argc, argv);
-}
diff --git a/compat/plan9/printf b/compat/plan9/printf
deleted file mode 100755
index 1a70a9e..0000000
--- a/compat/plan9/printf
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec awk "BEGIN { for (i = 2; i < ARGC; i++) printf \"$1\", ARGV[i] }" "$@"
diff --git a/configure b/configure
index d81b1cc..eed12bf 100755
--- a/configure
+++ b/configure
@@ -1175,7 +1175,7 @@ apply(){
cp_if_changed(){
cmp -s "$1" "$2" && { test "$quiet" != "yes" && echo "$2 is unchanged"; }
&& return
mkdir -p "$(dirname $2)"
- $cp_f "$1" "$2"
+ cp -f "$1" "$2"
}
# CONFIG_LIST contains configurable options, while HAVE_LIST is for
@@ -2494,7 +2494,6 @@ shlibdir_default="$libdir_default"
ar_default="ar"
cc_default="gcc"
host_cc_default="gcc"
-cp_f="cp -f"
ln_s="ln -s -f"
nm_default="nm -g"
objformat="elf"
@@ -3986,17 +3985,6 @@ case $target_os in
;;
minix)
;;
- plan9)
- add_cppflags -D_C99_SNPRINTF_EXTENSION \
- -D_REENTRANT_SOURCE \
- -D_RESEARCH_SOURCE \
- -DFD_SETSIZE=96 \
- -DHAVE_SOCK_OPTS
- add_compat strtod.o strtod=avpriv_strtod
- network_extralibs='-lbsd'
- exeobjs=compat/plan9/main.o
- cp_f='cp'
- ;;
none)
;;
*)
@@ -5051,9 +5039,6 @@ case $target_os in
osf1)
enabled ccc && add_ldflags '-Wl,-expect_unresolved,*'
;;
- plan9)
- add_cppflags -Dmain=plan9_main
- ;;
esac
enabled asm || { arch=c; disable $ARCH_LIST $ARCH_EXT_LIST; }
@@ -5303,7 +5288,6 @@ ZLIB=$($ldflags_filter -lz)
LIB_INSTALL_EXTRA_CMD=$LIB_INSTALL_EXTRA_CMD
EXTRALIBS=$extralibs
COMPAT_OBJS=$compat_objs
-EXEOBJS=$exeobjs
INSTALL=install
LIBTARGET=${LIBTARGET}
SLIBNAME=${SLIBNAME}
diff --git a/doc/platform.texi b/doc/platform.texi
index 4feb50f..74b014e 100644
--- a/doc/platform.texi
+++ b/doc/platform.texi
@@ -336,67 +336,4 @@ and for a build with shared libraries
./configure --target-os=mingw32 --enable-shared --disable-static
--extra-cflags=-mno-cygwin --extra-libs=-mno-cygwin
@end example
-@chapter Plan 9
-
-The native @uref{http://plan9.bell-labs.com/plan9/, Plan 9} compiler
-does not implement all the C99 features needed by Libav so the gcc
-port must be used. Furthermore, a few items missing from the C
-library and shell environment need to be fixed.
-
-@itemize
-
-@item GNU awk, grep, make, and sed
-
-Working packages of these tools can be found at
-@uref{http://code.google.com/p/ports2plan9/downloads/list, ports2plan9}.
-They can be installed with @uref{http://9front.org/, 9front's} @code{pkg}
-utility by setting @code{pkgpath} to
-@code{http://ports2plan9.googlecode.com/files/}.
-
-@item Missing/broken @code{head} and @code{printf} commands
-
-Replacements adequate for building Libav can be found in the
-@code{compat/plan9} directory. Place these somewhere they will be
-found by the shell. These are not full implementations of the
-commands and are @emph{not} suitable for general use.
-
-@item Missing C99 @code{stdint.h} and @code{inttypes.h}
-
-Replacement headers are available from
-@url{http://code.google.com/p/plan9front/issues/detail?id=152}.
-
-@item Missing or non-standard library functions
-
-Some functions in the C library are missing or incomplete. The
-@code{@uref{http://ports2plan9.googlecode.com/files/gcc-apelibs-1207.tbz,
-gcc-apelibs-1207}} package from
-@uref{http://code.google.com/p/ports2plan9/downloads/list, ports2plan9}
-includes an updated C library, but installing the full package gives
-unusable executables. Instead, keep the files from @code{gccbin.tgz}
-under @code{/386/lib/gnu}. From the @code{libc.a} archive in the
-@code{gcc-apelibs-1207} package, extract the following object files and
-turn them into a library:
-
-@itemize
-@item @code{strerror.o}
-@item @code{strtoll.o}
-@item @code{snprintf.o}
-@item @code{vsnprintf.o}
-@item @code{vfprintf.o}
-@item @code{_IO_getc.o}
-@item @code{_IO_putc.o}
-@end itemize
-
-Use the @code{--extra-libs} option of @code{configure} to inform the
-build system of this library.
-
-@item FPU exceptions enabled by default
-
-Unlike most other systems, Plan 9 enables FPU exceptions by default.
-These must be disabled before calling any Libav functions. While the
-included tools will do this automatically, other users of the
-libraries must do it themselves.
-
-@end itemize
-
@bye
diff --git a/libavformat/os_support.h b/libavformat/os_support.h
index 6cc6d9a..965e16f 100644
--- a/libavformat/os_support.h
+++ b/libavformat/os_support.h
@@ -59,7 +59,7 @@ static inline int is_dos_path(const char *path)
return 0;
}
-#if defined(__OS2__) || defined(__Plan9__)
+#if defined(__OS2__)
#define SHUT_RD 0
#define SHUT_WR 1
#define SHUT_RDWR 2
diff --git a/library.mak b/library.mak
index 73f65ec..bf1853f 100644
--- a/library.mak
+++ b/library.mak
@@ -27,7 +27,7 @@ define RULES
$(TOOLS): THISLIB = $(NAME:%=$(LD_LIB))
$(TESTPROGS): THISLIB = $(SUBDIR)$(LIBNAME)
-$(TESTPROGS) $(TOOLS): %$(EXESUF): %.o $(EXEOBJS)
+$(TESTPROGS) $(TOOLS): %$(EXESUF): %.o
$$(LD) $(LDFLAGS) $(LDEXEFLAGS) $$(LD_O) $$(filter %.o,$$^) $$(THISLIB)
$(FFEXTRALIBS) $$(ELIBS)
$(SUBDIR)lib$(NAME).ver: $(SUBDIR)lib$(NAME).v $(OBJS)
diff --git a/tests/checkasm/Makefile b/tests/checkasm/Makefile
index dbd7393..639a08e 100644
--- a/tests/checkasm/Makefile
+++ b/tests/checkasm/Makefile
@@ -34,7 +34,7 @@ OBJDIRS += $(CHECKASMDIRS)
CHECKASM := tests/checkasm/checkasm$(EXESUF)
-$(CHECKASM): $(EXEOBJS) $(CHECKASMOBJS) $(FF_STATIC_DEP_LIBS)
+$(CHECKASM): $(CHECKASMOBJS) $(FF_STATIC_DEP_LIBS)
$(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $(CHECKASMOBJS)
$(FF_STATIC_DEP_LIBS) $(EXTRALIBS)
checkasm: $(CHECKASM)
--
2.1.4
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
