Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support 32-bit ARM, so that mealie 32-bit ARM can leverage it #1

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@ FROM ubuntu:20.04
RUN apt-get update --yes && \
apt-get upgrade --yes && \
apt-get install --yes \
build-essential && \
build-essential autoconf && \
rm -rf /var/lib/apt/lists/* && \
rm -Rf /usr/share/doc && \
rm -Rf /usr/share/man && \
apt-get autoremove -y

RUN apt-get update --yes && apt-get install --yes libtool

ADD . /crfpp
WORKDIR /crfpp
Expand Down
22 changes: 11 additions & 11 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -139,12 +139,12 @@ distuninstallcheck_listfiles = find . -type f -print
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
distcleancheck_listfiles = find . -type f -print
ACLOCAL = ${SHELL} /Users/taku/proj/crfpp/missing --run aclocal-1.11
ACLOCAL = ${SHELL} /crfpp/missing --run aclocal-1.11
AMTAR = $${TAR-tar}
AR = ar
AUTOCONF = ${SHELL} /Users/taku/proj/crfpp/missing --run autoconf
AUTOHEADER = ${SHELL} /Users/taku/proj/crfpp/missing --run autoheader
AUTOMAKE = ${SHELL} /Users/taku/proj/crfpp/missing --run automake-1.11
AUTOCONF = ${SHELL} /crfpp/missing --run autoconf
AUTOHEADER = ${SHELL} /crfpp/missing --run autoheader
AUTOMAKE = ${SHELL} /crfpp/missing --run automake-1.11
AWK = awk
CC = gcc
CCDEPMODE = depmode=gcc3
Expand Down Expand Up @@ -181,7 +181,7 @@ LIBTOOL = $(SHELL) $(top_builddir)/libtool
LIPO = lipo
LN_S = ln -s
LTLIBOBJS =
MAKEINFO = ${SHELL} /Users/taku/proj/crfpp/missing --run makeinfo
MAKEINFO = ${SHELL} /crfpp/missing --run makeinfo
MANIFEST_TOOL = :
MKDIR_P = /usr/local/bin/gmkdir -p
NM = /usr/bin/nm
Expand All @@ -201,13 +201,13 @@ PATH_SEPARATOR = :
RANLIB = ranlib
SED = /usr/bin/sed
SET_MAKE =
SHELL = /bin/sh
SHELL = /bin/bash
STRIP = strip
VERSION = 0.59
abs_builddir = /Users/taku/proj/crfpp
abs_srcdir = /Users/taku/proj/crfpp
abs_top_builddir = /Users/taku/proj/crfpp
abs_top_srcdir = /Users/taku/proj/crfpp
abs_builddir = /crfpp
abs_srcdir = /crfpp
abs_top_builddir = /crfpp
abs_top_srcdir = /crfpp
ac_ct_AR = ar
ac_ct_CC = gcc
ac_ct_CXX = g++
Expand Down Expand Up @@ -237,7 +237,7 @@ host_vendor = apple
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
install_sh = ${SHELL} /Users/taku/proj/crfpp/install-sh
install_sh = ${SHELL} /crfpp/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale
Expand Down
2 changes: 1 addition & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ EXTRA_DIRS = doc example sdk perl python ruby java swig
bin_PROGRAMS = crf_learn crf_test
ACLOCAL_AMFLAGS = -I m4

AUTOMAKE_OPTIONS = no-dependencies
AUTOMAKE_OPTIONS = no-dependencies foreign
lib_LTLIBRARIES = libcrfpp.la
libcrfpp_la_SOURCES = crfpp.h thread.h libcrfpp.cpp lbfgs.cpp scoped_ptr.h param.cpp param.h encoder.cpp feature.cpp stream_wrapper.h \
feature_cache.cpp feature_index.cpp node.cpp path.cpp tagger.cpp \
Expand Down
2 changes: 1 addition & 1 deletion common.h
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ class string_buffer: public std::string {
string_buffer& operator<<(unsigned short int _n) { _UITOA(_n); }
string_buffer& operator<<(unsigned int _n) { _UITOA(_n); }
// string_buffer& operator<<(unsigned long int _n) { _UITOA(_n); }
string_buffer& operator<<(size_t _n) { _UITOA(_n); }
// string_buffer& operator<<(size_t _n) { _UITOA(_n); }
string_buffer& operator<<(char _n) {
push_back(_n);
return *this;
Expand Down
2 changes: 1 addition & 1 deletion configure
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /bin/sh
#! /bin/bash
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69.
#
Expand Down
10 changes: 7 additions & 3 deletions docker-build.sh
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
#!/bin/bash

ARCH=`uname -m`
if [[ ARCH = "x86_64" ]]; then
echo "Setting amd64"
export BUILD_ARCH=x86_64-unknown-linux-gnu
else
echo "Setting arm64"
export BUILD_ARCH=aarch64-unknown-linux-gnu
echo "Setting arm v7"
export BUILD_ARCH=arm-unknown-linux-gnueabihf
fi
echo "Done"


chmod +x configure
autoreconf -fi
./configure --build=$BUILD_ARCH
make
make install
Expand Down
2 changes: 1 addition & 1 deletion missing
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /bin/sh
#! /bin/bash
# Common stub for a few missing GNU programs while installing.

scriptversion=2004-09-07.08
Expand Down