Merge pull request #22 from acornejo/add-docker

add Dockerfile to repository

diff --git a/disabled-packages/mosh/BROKEN.txt b/disabled-packages/mosh/BROKEN.txt
deleted file mode 100644 (file)
index 7e5928b..0000000
--- a/disabled-packages/mosh/BROKEN.txt
+++ /dev/null
@@ -1 +0,0 @@
-Segfaults after ssh auth

diff --git a/disabled-packages/mosh/build.sh b/disabled-packages/mosh/build.sh
index efd195b..5fcf437 100644 (file)
--- a/disabled-packages/mosh/build.sh
+++ b/disabled-packages/mosh/build.sh
@@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=http://mosh.mit.edu/
 TERMUX_PKG_DESCRIPTION="Mobile shell that supports roaming and intelligent local echo"
 TERMUX_PKG_VERSION=1.2.5
 TERMUX_PKG_SRCURL=http://mosh.mit.edu/mosh-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_DEPENDS="libandroid-support, protobuf, ncurses, openssl, perl"
+TERMUX_PKG_DEPENDS="libandroid-support, protobuf, ncurses, openssl, libutil, perl"
 
 export PROTOC=$TERMUX_TOPDIR/protobuf/host-build/src/protoc
 

diff --git a/disabled-packages/mosh/pty_compat.cc.patch b/disabled-packages/mosh/pty_compat.cc.patch
deleted file mode 100644 (file)
index 4e950fd..0000000
--- a/disabled-packages/mosh/pty_compat.cc.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -u -r ../mosh-1.2.4/src/util/pty_compat.cc ./src/util/pty_compat.cc
---- ../mosh-1.2.4/src/util/pty_compat.cc        2013-03-10 21:45:37.000000000 +0100
-+++ ./src/util/pty_compat.cc    2014-01-23 03:18:24.000000000 +0100
-@@ -39,7 +39,6 @@
- #include <unistd.h>
- #include <fcntl.h>
- #include <sys/ioctl.h>
--#include <sys/stropts.h>
- #include <termios.h>
-
- #include "pty_compat.h"
-@@ -92,7 +91,7 @@
-     return -1;
-   }
-
--#ifndef _AIX
-+#ifndef __ANDROID__
-   if ( ioctl(slave, I_PUSH, "ptem") < 0 ||
-        ioctl(slave, I_PUSH, "ldterm") < 0 ) {
-     perror( "ioctl(I_PUSH)" );

diff --git a/packages/clang/build.sh b/packages/clang/build.sh
index 211eda8..a5ebc22 100644 (file)
--- a/packages/clang/build.sh
+++ b/packages/clang/build.sh
@@ -48,7 +48,7 @@ termux_step_configure () {
                -DCMAKE_RANLIB=`which ${TERMUX_HOST_PLATFORM}-ranlib` \
                -DCMAKE_SYSTEM_NAME=Linux \
                -DLLVM_TABLEGEN=$TERMUX_PKG_HOSTBUILD_DIR/bin/llvm-tblgen \
-               -DLLVM_DEFAULT_TARGET_TRIPLE=$LLVM_DEFAULT_TARGET_TRIPLE \
+               -DLLVM_DEFAULT_TARGET_TRIPLE=$LLVM_DEFAULT_TARGET_TRIPLE \
                -DLLVM_TARGET_ARCH=$LLVM_TARGET_ARCH \
                -DLLVM_TARGETS_TO_BUILD=$LLVM_TARGET_ARCH \
                -DLLVM_ENABLE_PIC=ON \

diff --git a/packages/emacs/build.sh b/packages/emacs/build.sh
index 1ae3acf..7d7c2ee 100644 (file)
--- a/packages/emacs/build.sh
+++ b/packages/emacs/build.sh
@@ -1,5 +1,5 @@
 TERMUX_PKG_HOMEPAGE=http://www.gnu.org/software/emacs/
-TERMUX_PKG_DESCRIPTION="Extensible, customizable text editor—and more"
+TERMUX_PKG_DESCRIPTION="Extensible, customizable text editor-and more"
 TERMUX_PKG_VERSION=24.5
 TERMUX_PKG_BUILD_REVISION=1
 TERMUX_PKG_SRCURL=http://ftp.gnu.org/pub/gnu/emacs/emacs-${TERMUX_PKG_VERSION}.tar.xz
@@ -16,8 +16,8 @@ TERMUX_PKG_RM_AFTER_INSTALL="share/icons share/emacs/${TERMUX_PKG_VERSION}/etc/i
 # The command temacs -l loadup would run temacs and direct it to load loadup.el. The loadup library loads additional Lisp libraries,
 # which set up the normal Emacs editing environment. After this step, the Emacs executable is no longer bare.
 # Because it takes some time to load the standard Lisp files, the temacs executable usually isn't run directly by users. Instead, as
-# one of the last steps of building Emacs, the command ‘temacs -batch -l loadup dump’ is run. The special ‘dump’ argument causes temacs
-# to dump out an executable program, called emacs, which has all the standard Lisp files preloaded. (The ‘-batch’ argument prevents
+# one of the last steps of building Emacs, the command 'temacs -batch -l loadup dump' is run. The special 'dump' argument causes temacs
+# to dump out an executable program, called emacs, which has all the standard Lisp files preloaded. (The '-batch' argument prevents
 # temacs from trying to initialize any of its data on the terminal, so that the tables of terminal information are empty in the dumped Emacs.)"
 
 ########## FROM src/Makefile:

diff --git a/packages/gcc/build.sh b/packages/gcc/build.sh
index 6bb2646..38311da 100755 (executable)
--- a/packages/gcc/build.sh
+++ b/packages/gcc/build.sh
@@ -54,7 +54,7 @@ termux_step_make_install () {
 }
 
 termux_step_post_make_install () {
-       if [ $TERMUX_ARCH = "arm" ]; then
+       if [ $TERMUX_ARCH = "arm" ]; then
                # Note that moving to $TERMUX_PREFIX/lib/gcc/arm-linux-androideabi/${TERMUX_PKG_VERSION}/
                # allows compilation but fails to link at runtime
                mv $TERMUX_PREFIX/lib/armv7-a/hard/libgcc_s* $TERMUX_PREFIX/lib/

diff --git a/packages/libutil/build.sh b/packages/libutil/build.sh
index 5640a57..1f1a73f 100644 (file)
--- a/packages/libutil/build.sh
+++ b/packages/libutil/build.sh
@@ -1,6 +1,6 @@
 TERMUX_PKG_HOMEPAGE=https://refspecs.linuxbase.org/LSB_2.1.0/LSB-generic/LSB-generic/libutil.html
 TERMUX_PKG_DESCRIPTION="Library with terminal functions"
-TERMUX_PKG_VERSION=0.1
+TERMUX_PKG_VERSION=0.2
 TERMUX_PKG_BUILD_IN_SRC=yes
 
 termux_step_make_install () {

diff --git a/packages/libutil/pty.h b/packages/libutil/pty.h
index 899e17d..832c4e9 100644 (file)
--- a/packages/libutil/pty.h
+++ b/packages/libutil/pty.h
@@ -1,12 +1,17 @@
 #ifndef _PTY_H
 #define _PTY_H
 
+#include <sys/cdefs.h>
 #include <termios.h>
 
+__BEGIN_DECLS
+
 int openpty(int* amaster, int* aslave, char* name, struct termios* termp, struct winsize* winp);
 
 int login_tty(int fd);
 
 int forkpty(int* amaster, char* name, struct termios* termp, struct winsize* winp);
 
+__END_DECLS
+
 #endif