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

knightos-scas: 0.4.6 -> 0.5.3, knightos-z80e: 0.5.0 -> 0.5.2 #99272

Merged
merged 2 commits into from Dec 20, 2020

Conversation

@siraben
Copy link
Member

@siraben siraben commented Oct 1, 2020

Motivation for this change

Update scas

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
@siraben siraben changed the title knightos-scas: 0.4.6 -> 1.0.0_rc2 knightos-scas: 0.4.6 -> 0.5.0 Nov 22, 2020
@siraben
Copy link
Member Author

@siraben siraben commented Nov 22, 2020

Result of nixpkgs-review pr 99272 1

1 package built:
  • knightos-scas

@SuperSandro2000
Copy link
Member

@SuperSandro2000 SuperSandro2000 commented Nov 25, 2020

Result of nixpkgs-review pr 99272 run on x86_64-linux 1

1 package failed to build:
  • knightos-z80e
1 package built:
  • knightos-scas

knightos-z80e:

@nix { "action": "setPhase", "phase": "unpackPhase" }
unpacking sources
unpacking source archive /nix/store/hbfdi2l2k9fda240wv6i8gn8l036zg68-source
source root is source
@nix { "action": "setPhase", "phase": "patchPhase" }
patching sources
@nix { "action": "setPhase", "phase": "configurePhase" }
configuring
fixing cmake files...
cmake flags: -DCMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY=OFF -DCMAKE_FIND_USE_PACKAGE_REGISTRY=OFF -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_BUILD_RPATH=ON -DBUILD_TESTING=OFF -DCMAKE_INSTALL_LOCALEDIR=/nix/store/xq42fng37rmy408s3l77g53ramk2qg6n-z80e-0.5.0/share/locale -DCMAKE_INSTALL_LIBEXECDIR=/nix/store/xq42fng37rmy408s3l77g53ramk2qg6n-z80e-0.5.0/libexec -DCMAKE_INSTALL_LIBDIR=/nix/store/xq42fng37rmy408s3l77g53ramk2qg6n-z80e-0.5.0/lib -DCMAKE_INSTALL_DOCDIR=/nix/store/xq42fng37rmy408s3l77g53ramk2qg6n-z80e-0.5.0/share/doc/z80e -DCMAKE_INSTALL_INFODIR=/nix/store/xq42fng37rmy408s3l77g53ramk2qg6n-z80e-0.5.0/share/info -DCMAKE_INSTALL_MANDIR=/nix/store/xq42fng37rmy408s3l77g53ramk2qg6n-z80e-0.5.0/share/man -DCMAKE_INSTALL_OLDINCLUDEDIR=/nix/store/xq42fng37rmy408s3l77g53ramk2qg6n-z80e-0.5.0/include -DCMAKE_INSTALL_INCLUDEDIR=/nix/store/xq42fng37rmy408s3l77g53ramk2qg6n-z80e-0.5.0/include -DCMAKE_INSTALL_SBINDIR=/nix/store/xq42fng37rmy408s3l77g53ramk2qg6n-z80e-0.5.0/sbin -DCMAKE_INSTALL_BINDIR=/nix/store/xq42fng37rmy408s3l77g53ramk2qg6n-z80e-0.5.0/bin -DCMAKE_INSTALL_NAME_DIR=/nix/store/xq42fng37rmy408s3l77g53ramk2qg6n-z80e-0.5.0/lib -DCMAKE_POLICY_DEFAULT_CMP0025=NEW -DCMAKE_OSX_SYSROOT= -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_FIND_FRAMEWORK=LAST -DCMAKE_STRIP=/nix/store/p3kn26g5nhmx6spn37ar3mn0xjbzks3g-binutils-2.31.1/bin/strip -DCMAKE_RANLIB=/nix/store/p3kn26g5nhmx6spn37ar3mn0xjbzks3g-binutils-2.31.1/bin/ranlib -DCMAKE_AR=/nix/store/p3kn26g5nhmx6spn37ar3mn0xjbzks3g-binutils-2.31.1/bin/ar -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_INSTALL_PREFIX=/nix/store/xq42fng37rmy408s3l77g53ramk2qg6n-z80e-0.5.0 -Denable-sdl=YES 
-- The C compiler identification is GNU 9.3.0
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Check for working C compiler: /nix/store/s3j2gpc2s7cdn2wafm192jfp9k8jfvhs-gcc-wrapper-9.3.0/bin/gcc - skipped
-- Detecting C compile features
-- Detecting C compile features - done
-- The CXX compiler identification is GNU 9.3.0
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
-- Check for working CXX compiler: /nix/store/s3j2gpc2s7cdn2wafm192jfp9k8jfvhs-gcc-wrapper-9.3.0/bin/g++ - skipped
-- Detecting CXX compile features
-- Detecting CXX compile features - done
-- /build/source/libz80e/../CMake
CMake Warning (dev) at /nix/store/21cib7707fqxwg9xpjx0hfa5p9bx8hvh-cmake-3.18.4/share/cmake-3.18/Modules/FindPackageHandleStandardArgs.cmake:273 (message):
  The package name passed to `find_package_handle_standard_args` (SCAS) does
  not match the name of the calling package (Scas).  This can lead to
  problems in calling code that expects `find_package` result variables
  (e.g., `_FOUND`) to follow a certain pattern.
Call Stack (most recent call first):
  CMake/FindScas.cmake:17 (find_package_handle_standard_args)
  libz80e/CMakeLists.txt:6 (find_package)
This warning is for project developers.  Use -Wno-dev to suppress it.

-- Could NOT find SCAS (missing: SCAS_LIBRARIES) 
CMake Warning (dev) at /nix/store/21cib7707fqxwg9xpjx0hfa5p9bx8hvh-cmake-3.18.4/share/cmake-3.18/Modules/FindPackageHandleStandardArgs.cmake:273 (message):
  The package name passed to `find_package_handle_standard_args` (SCAS) does
  not match the name of the calling package (Scas).  This can lead to
  problems in calling code that expects `find_package` result variables
  (e.g., `_FOUND`) to follow a certain pattern.
Call Stack (most recent call first):
  CMake/FindScas.cmake:17 (find_package_handle_standard_args)
  frontends/tui/CMakeLists.txt:8 (find_package)
This warning is for project developers.  Use -Wno-dev to suppress it.

CMake Warning (dev) at /nix/store/21cib7707fqxwg9xpjx0hfa5p9bx8hvh-cmake-3.18.4/share/cmake-3.18/Modules/FindPackageHandleStandardArgs.cmake:273 (message):
  The package name passed to `find_package_handle_standard_args` (SCAS) does
  not match the name of the calling package (Scas).  This can lead to
  problems in calling code that expects `find_package` result variables
  (e.g., `_FOUND`) to follow a certain pattern.
Call Stack (most recent call first):
  CMake/FindScas.cmake:17 (find_package_handle_standard_args)
  frontends/sdl/CMakeLists.txt:6 (find_package)
This warning is for project developers.  Use -Wno-dev to suppress it.

-- Configuring done
CMake Error: The following variables are used in this project, but they are set to NOTFOUND.
Please set them or make sure they are set and tested correctly in the CMake files:
SCAS_LIBRARIES (ADVANCED)
    linked by target "z80e" in directory /build/source/frontends/libz80e
    linked by target "z80e-tui" in directory /build/source/frontends/tui
    linked by target "z80e-sdl" in directory /build/source/frontends/sdl

-- Generating done
CMake Warning:
  Manually-specified variables were not used by the project:

    BUILD_TESTING
    CMAKE_EXPORT_NO_PACKAGE_REGISTRY
    CMAKE_INSTALL_BINDIR
    CMAKE_INSTALL_DOCDIR
    CMAKE_INSTALL_INCLUDEDIR
    CMAKE_INSTALL_INFODIR
    CMAKE_INSTALL_LIBDIR
    CMAKE_INSTALL_LIBEXECDIR
    CMAKE_INSTALL_LOCALEDIR
    CMAKE_INSTALL_MANDIR
    CMAKE_INSTALL_OLDINCLUDEDIR
    CMAKE_INSTALL_SBINDIR


CMake Generate step failed.  Build files cannot be regenerated correctly.

@siraben
Copy link
Member Author

@siraben siraben commented Nov 25, 2020

Result of git bisect

git bisect start 'master' '0.4.6'
9cb7459 bad Update license
b6c5548 good Switch _XOPEN_SOURCE to 700. You win, skarnet.

git bisect good 0c006b785de49d0a850b34bbe230ecd8d99a92cf
0c006b7 good List: don't memmove when deleting the last entry

git bisect bad 5d063e608a4747fce74a64c159562712b97f2458
5d063e6 bad Cleanup file reading

git bisect bad fc4b644c3c7748c4226760a34d0aed8a9a6be9ac
fc4b644 bad Make it possible to exclude libscas from build

git bisect good 245348b63c3984dbf16413405e28af30bdcd3541
245348b good Fix last kernel memory leak

git bisect good 229d08addf4a75101e4005cf503b4b7f6c5ad735
229d08a good Update status

fc4b644c3c7748c4226760a34d0aed8a9a6be9ac is the first bad commit

@siraben siraben force-pushed the scas-update branch 2 times, most recently from 84f311c to 12898f8 Nov 25, 2020
@SuperSandro2000
Copy link
Member

@SuperSandro2000 SuperSandro2000 commented Nov 26, 2020

Result of nixpkgs-review pr 99272 run on x86_64-linux 1

1 package failed to build:
  • knightos-z80e
1 package built:
  • knightos-scas
[ 93%] Linking C executable bin/z80e-sdl
/nix/store/p3kn26g5nhmx6spn37ar3mn0xjbzks3g-binutils-2.31.1/bin/ld: /nix/store/jy7x1m9rjkprnx04kph10i8y4a2s0drx-scas-0.5.0/lib/libscas.so: undefined reference to `scas_log'
/nix/store/p3kn26g5nhmx6spn37ar3mn0xjbzks3g-binutils-2.31.1/bin/ld: /nix/store/jy7x1m9rjkprnx04kph10i8y4a2s0drx-scas-0.5.0/lib/libscas.so: undefined reference to `scas_log_indent'
/nix/store/p3kn26g5nhmx6spn37ar3mn0xjbzks3g-binutils-2.31.1/bin/ld: /nix/store/jy7x1m9rjkprnx04kph10i8y4a2s0drx-scas-0.5.0/lib/libscas.so: undefined reference to `scas_log_deindent'
/nix/store/p3kn26g5nhmx6spn37ar3mn0xjbzks3g-binutils-2.31.1/bin/ld: /nix/store/jy7x1m9rjkprnx04kph10i8y4a2s0drx-scas-0.5.0/lib/libscas.so: undefined reference to `scas_abort'
collect2: error: ld returned 1 exit status
make[2]: *** [frontends/sdl/CMakeFiles/z80e-sdl.dir/build.make:195: frontends/sdl/bin/z80e-sdl] Error 1
make[1]: *** [CMakeFiles/Makefile2:257: frontends/sdl/CMakeFiles/z80e-sdl.dir/all] Error 2
make: *** [Makefile:149: all] Error 2

@SuperSandro2000
Copy link
Member

@SuperSandro2000 SuperSandro2000 commented Nov 26, 2020

Result of nixpkgs-review pr 99272 run on x86_64-darwin 1

2 packages failed to build:
  • knightos-scas
  • knightos-z80e
Undefined symbols for architecture x86_64:                                                                                                                                                    "_scas_abort", referenced from:                                                                                                                                                                 _scas_read in io.c.o                                                                                                                                                                        _freadobj in objects.c.o                                                                                                                                                                "_scas_log", referenced from:                                                                                                                                                                   _add_error in errors.c.o                                                                                                                                                                    _add_warning in errors.c.o                                                                                                                                                                  _add_error_from_map in errors.c.o                                                                                                                                                           _mark_precious in functions.c.o                                                                                                                                                             _mark_dependencies_precious in functions.c.o                                                                                                                                                _remove_unused_functions in functions.c.o                                                                                                                                                   _decode_function_metadata in functions.c.o                                                                                                                                                  ...                                                                                                                                                                                     "_scas_log_deindent", referenced from:                                                                                                                                                          _try_match_instruction in assembler.c.o                                                                                                                                                     _try_handle_directive in directives.c.o                                                                                                                                                     _resolve_immediate_values in linker.c.o                                                                                                                                                 "_scas_log_indent", referenced from:                                                                                                                                                            _try_match_instruction in assembler.c.o                                                                                                                                                     _try_handle_directive in directives.c.o                                                                                                                                                     _resolve_immediate_values in linker.c.o                                                                                                                                               ld: symbol(s) not found for architecture x86_64                                                                                                                                             clang-7: error: linker command failed with exit code 1 (use -v to see invocation)                                                                                                           make[2]: *** [CMakeFiles/libscas.dir/build.make:456: libscas.dylib] Error 1                                                                                                                 make[1]: *** [CMakeFiles/Makefile2:157: CMakeFiles/libscas.dir/all] Error 2                                                                                                                 make[1]: *** Waiting for unfinished jobs.... 

image

@siraben siraben marked this pull request as draft Nov 26, 2020
@siraben
Copy link
Member Author

@siraben siraben commented Nov 26, 2020

@SuperSandro2000 Thanks. I'll fix up this build and then mark as ready.

@siraben siraben marked this pull request as ready for review Dec 20, 2020
@siraben siraben requested a review from SuperSandro2000 Dec 20, 2020
@siraben siraben changed the title knightos-scas: 0.4.6 -> 0.5.0 knightos-scas: 0.4.6 -> 0.5.2, knightos-scas: 0.4.6 -> 0.5.0 Dec 20, 2020
@siraben siraben changed the title knightos-scas: 0.4.6 -> 0.5.2, knightos-scas: 0.4.6 -> 0.5.0 knightos-scas: 0.4.6 -> 0.5.3, knightos-scas: 0.4.6 -> 0.5.0 Dec 20, 2020
@siraben
Copy link
Member Author

@siraben siraben commented Dec 20, 2020

Result of nixpkgs-review pr 99272 run on x86_64-darwin 1

2 packages built:
  • knightos-scas
  • knightos-z80e

@siraben siraben changed the title knightos-scas: 0.4.6 -> 0.5.3, knightos-scas: 0.4.6 -> 0.5.0 knightos-z80e: 0.4.6 -> 0.5.3, knightos-scas: 0.4.6 -> 0.5.0 Dec 20, 2020
@siraben siraben changed the title knightos-z80e: 0.4.6 -> 0.5.3, knightos-scas: 0.4.6 -> 0.5.0 knightos-scas: 0.4.6 -> 0.5.3, knightos-z80e: 0.5.0 -> 0.5.2 Dec 20, 2020
@SuperSandro2000
Copy link
Member

@SuperSandro2000 SuperSandro2000 commented Dec 20, 2020

Result of nixpkgs-review pr 99272 run on x86_64-linux 1

2 packages built:
  • knightos-scas
  • knightos-z80e

@SuperSandro2000
Copy link
Member

@SuperSandro2000 SuperSandro2000 commented Dec 20, 2020

Result of nixpkgs-review pr 99272 run on x86_64-darwin 1

2 packages built:
  • knightos-scas
  • knightos-z80e

@SuperSandro2000 SuperSandro2000 merged commit 42f4fa5 into NixOS:master Dec 20, 2020
19 checks passed
@siraben siraben deleted the scas-update branch Dec 20, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants