Port upstream libgeos 3.11.2 #1
Conversation
There was a problem hiding this comment.
Few more comments.
Besides that, If I build with the unittests as main, I get multiple definitions of main:
/usr/bin/ld: workdir/apps/helloworld/build/libgeos_test.o: in function `main':
workdir/apps/helloworld/build/libgeos/origin/geos-3.11.2/tests/unit/geos_unit.cpp:57: multiple definition of `main';
Same with the cli main
/usr/bin/ld: workdir/apps/helloworld/build/libgeos.o: in function `main':
workdir/apps/helloworld/build/libgeos/origin/geos-3.11.2/util/geosop/GeosOp.cpp:54: multiple definition of `main';
README.md
Outdated
| libGEOS for Unikraft | ||
| ======================== | ||
|
|
||
| This is a port of [GEOS](https://libgeos.org/) to Unikraft. | ||
|
|
||
| Please refer to the `README.md` as well as the documentation in the | ||
| `doc/` subdirectory of the main unikraft repository for further | ||
| information. |
There was a problem hiding this comment.
Use md syntax instead of rst. Use one line per sentence and one sentence per line.
Also do not reference the old doc/ subdirectory, send people to the Unikraft website instead.
Config.uk
Outdated
| config LIBGEOS_CLI | ||
| bool "Provide the GeosOp command-line interface as main" | ||
| default n | ||
|
|
||
| config LIBGEOS_UNITTEST | ||
| bool "Provide the libgeos unit tests as main" | ||
| default n |
There was a problem hiding this comment.
These look like they should be mutually exclusive, since they both provide the main function.
There was a problem hiding this comment.
True, will change to a prompt.
| select LIBCXX | ||
| select CXX_THREADS |
There was a problem hiding this comment.
Is libcxx the only library this depends on? If not, we should add the rest here too.
There was a problem hiding this comment.
Yes, modulo the dependencies of libcxx itself.
andreittr
force-pushed
the
ttr/up-3-11-2
branch
from
0a15061
to
da33224
Compare
There was a problem hiding this comment.
Looks good now @andreittr.
I suppose the tests are known to fail, right?
capi::GEOSBoundary: .
capi::GEOSBuffer: ....................
capi::GEOSBuildArea: .
capi::GEOSCAPIDefines: ...
capi::GEOSClipByRect: .............[ 0.381145] CRIT: [libmusl] <abort.c @ 7> abort called
CONTRIBUTING.md
Outdated
| Contributing to Unikraft | ||
| ======================= | ||
|
|
||
| Please refer to the `CONTRIBUTING.md` file in the main Unikraft repository. |
There was a problem hiding this comment.
Also use md format here instead of rst, and send people to the contributing section on the website (https://unikraft.org/docs/contributing/)
Signed-off-by: Andrei Tatar <andrei@unikraft.io>
Files under `include/` are generated by the upstream build process from templates. We include these files verbatim for the unikraft build. Signed-off-by: Andrei Tatar <andrei@unikraft.io>
andreittr
force-pushed
the
ttr/up-3-11-2
branch
from
da33224
to
460a8d1
Compare
Yeah... I remember GEOSClipByRect aborting out, but haven't really had the time to look into it during porting. |
There was a problem hiding this comment.
All good, thanks.
Reviewed-by: Stefan Jumarea stefanjumarea02@gmail.com
There was a problem hiding this comment.
All good also on my side. Thanks @andreittr
Reviewed-by: Radu Nichita radunichita99@gmail.com
Files under `include/` are generated by the upstream build process from templates. We include these files verbatim for the unikraft build. Signed-off-by: Andrei Tatar <andrei@unikraft.io> Reviewed-by: Stefan Jumarea <stefanjumarea02@gmail.com> Reviewed-by: Radu Nichita <radunichita99@gmail.com> Approved-by: Razvan Deaconescu <razvand@unikraft.io> Tested-by: Unikraft CI <monkey@unikraft.io> GitHub-Closes: #1
GEOS is a C/C++ library for GIS computational geometry.
Due to requiring a tree build, depends on unikraft/unikraft#1001.
Part of work on porting the Shapely Python 3 extension.