it's okay now

1 files changed, 18 insertions, 176 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 0709145871e8..a05415d3a4f2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -34,138 +34,41 @@ source=("${pkgname}::git+${url}#commit=${_commit}"
 sha256sums=('SKIP'
             'SKIP')
 
-_iop_include="/usr/${_iop}/include"
 _ee_include="/usr/${_ee}/include"
-_nn_include="/usr/${_ee}/include/newlib-nano"
-
+_ee_lib="/usr/${_ee}/lib"
 _sdk_include="/usr/include/${_platform}${_base}"
 _pe_include="/usr/${_ee}/include/pthread-embedded"
+_pe_lib="/usr/${_ee}/lib/pthread-embedded"
 
-_iop_incs=(# ${_cflags[*]}
-           -I"${_iop_include}")
-
-# _ee_incs=(-I"${_sdk_include}")
-          # -I"${_ee_include}")
-
-_ldflags=(-L"/usr/${_ee}/lib/pthread-embedded"
-          # -T"/usr/${_ee}/startup/linkfile"
-          # "/usr/lib/libz.a"
-          # "/usr/lib/libid3tag.so"
-          -L"/usr/${_ee}/lib")
-          # -L"/usr/${_ee}/lib/newlib-nano"
-          # "/usr/${_ee}/lib/newlib-nano/libc_nano.a"
-          # "/usr/${_ee}/lib/newlib-nano/libm_nano.a"
-          # "/usr/${_ee}/lib/newlib-nano/libg_nano.a"
-          # "/usr/${_ee}/lib/newlib-nano/crt0.o")
-
-_build_opts=(# CFLAGS="${_cflags[*]}"
-             ${_make_opts[@]}
-             CPPFLAGS="${_cflags[*]}"
-             CXXFLAGS="${_cflags[*]}"
-             LDFLAGS="${_ldflags[*]}")
+_ldflags=(-L"${_pe_lib}"
+          -L"${_ee_lib}")
 
 prepare() {
     cd "${srcdir}/${_platform}-ports"
     local _rep 
-    local _reps=("s~\$ENV{PS2SDK}/ee/include~/usr/${_ee}/include~g"
-                 "s~\$ENV{PS2SDK}/common/include~/usr/include/${_platform}${_base}~g"
-                 "s~\$ENV{PS2DEV}/ee/ee~/usr/${_ee}~g"
-                 "s~\$ENV{PS2DEV}/ee~/usr/${_ee}~g"
-                 "s~CMAKE_C_FLAGS_INIT \"~CMAKE_C_FLAGS_INIT \"-I${_nn_include} ~g"
-                 "s~CMAKE_CXX_FLAGS_INIT \"~CMAKE_CXX_FLAGS_INIT \"-I${_nn_include} ~g"
-                 "s~CMAKE_C_FLAGS_INIT \"~CMAKE_C_FLAGS_INIT \"-I${_pe_include} ~g"
-                 "s~CMAKE_CXX_FLAGS_INIT \"~CMAKE_CXX_FLAGS_INIT \"-I${_pe_include} ~g")
-                 # "s~-D_EE~-Wl,-L/usr/${_ee}/lib/pthread-embedded -D_EE~g"
-                 # "s~-D_EE~-Wl,-L/usr/${_ee}/lib -D_EE~g"
-                 # "s~-D_EE~-lc -D_EE~g"
-                 # "s~-D_EE~-Wl,-Bstatic -D_EE~g"
-                 # "s~-D_EE~-lpthread -D_EE~g")
-                 # "s~-D_EE~-Wl,-L/usr/${_ee}/lib/newlib-nano -D_EE~g")
+    local _reps=("s~\$ENV{PS2SDK}/ee/include~${_ee_include}~g"
+                 "s~\$ENV{PS2SDK}/common/include~${_sdk_include}~g"
+                 "s~\$ENV{PS2DEV}/ee/ee~~g"
+                 "s~\$ENV{PS2DEV}/ee~~g"
+                 "s~\$ENV{PS2DEV}/ports~${pkgdir}/usr/ports~g"
+                 "s~\$ENV{PS2DEV}~~g"
+                 "s~\$ENV{PS2SDK}/ports~~g"
+                 "s~\$ENV{PS2SDK}~~g"
+                 "s~CMAKE_FIND_ROOT_PATH ~CMAKE_FIND_ROOT_PATH /usr/${_ee}~g"
+                 "s~CMAKE_C_FLAGS_INIT \"~CMAKE_C_FLAGS_INIT \"-std=gnu++11 ~g"
+                 "s~-D_EE~-D_EE -r~g")
     for _rep in "${_reps[@]}"; do
         sed -i "${_rep}" "${_platform}dev.cmake"
     done
-    local _linker_flags=(# "-L/usr/${_ee}/lib/pthread-embedded"
-                         # "-L/usr/${_ee}/lib/newlib-nano"
-                         # "-lc_nano"
-                         # "/usr/${_ee}/lib/libc.a")
-                         "-L/usr/${_ee}/lib")
-                         # "/usr/lib/libz.a")
-    echo "SET(GCC_COVERAGE_LINK_FLAGS \"${_linker_flags[*]}\")" >> "${_platform}dev.cmake"
-    # echo "find_package(libc)" >> "${_platform}dev.cmake"
-    # echo "include_directories(/usr/${_ee}/include)" >> "${_platform}dev.cmake"
-    # echo "target_link_libraries(zlib /usr/${_ee}/lib/libc.a)" >> "${_platform}dev.cmake"
-    echo "SET(CMAKE_EXE_LINKER_FLAGS_INIT \"${_linker_flags[*]}\")" >> "${_platform}dev.cmake"
-    # echo "SET(CMAKE_STATIC_LINKER_FLAGS_INIT \"${_linker_flags[*]}\")" >> "${_platform}dev.cmake"
-    # echo "SET(CMAKE_SHARED_LINKER_FLAGS_INIT \"${_linker_flags[*]}\")" >> "${_platform}dev.cmake"
-    cat "${_platform}dev.cmake"
-#   cd "${srcdir}/${pkgname}"
-#   local _sample _samples=()
-#   _samples=($(find . | grep Makefile))
-#   for _sample in "${_samples[@]}"; do
-#     sed -i 's/include $(PS2SDK)\/samples/include $(PS2SDKDATADIR)\/samples/g' "${_sample}"
-#     sed -i "s~\$(PS2SDK)/bin/bin2c~/usr/bin/bin2c~g" "${_sample}"
-#     sed -i "s~\$(PS2DEV)/isjpcm/bin~/usr/${_iop}\-irx/irx~g" "${_sample}"
-#     sed -i "s~-I\$(PS2DEV)/isjpcm/include~-include /usr/${_ee}/include/sjpcm.h~g" "${_sample}"
-#     sed -i "s~-L\$(PS2DEV)/isjpcm/lib~/usr/${_ee}/lib/libsjpcm.a~g" "${_sample}"
-#     sed -i "s~-L\$(PS2SDK)/ee/lib~-L/usr/${_ee}/lib~g" "${_sample}"
-#     sed -i "s~-I\$(PS2SDK)/common/include~-I/usr/include/ps2sdk~g" "${_sample}"
-#     sed -i "s~-I\$(PS2SDK)/ee/include~-I/usr/${_ee}/include~g" "${_sample}"
-#     # sed -i "s~\$(PS2SDK)/ee~/usr/${_ee}~g" "${_sample}"
-#     # sed -i "s~\$(PS2SDK)/iop~/usr/${_iop}-irx~g" "${_sample}"
-#     # sed -i "s/EE_INCS = -I..\/include/EE_INCS = -I\/..include -I\/usr\/${_ee}\/include\/${_platform}${_base}/g" "libmad/Makefile"
-#   done
-#   # sed -i "/EE_CFLAGS =/d" "libjpeg/src/Makefile"
-#   # cat "libjpeg/src/Makefile"
-#   # sed -i "s~EE_INCS  =~EE_INCS  = -I/usr/${_ee}/include -Wl,-L/usr/${_ee}/lib,/usr/${_ee}/lib/libkernel.a -I/usr/include/${_platform}${_base}~g" "libjpeg/src/Makefile"
-#   # sed -i "s~EE_INCS  =~EE_INCS  = -I/usr/${_ee}/include -Wl,-L/usr/${_ee}/lib,/usr/${_ee}/lib/libkernel.a -I/usr/include/${_platform}${_base}~g" "libjpeg/src/Makefile"
-#   # cat "libjpeg/src/Makefile"
-#   # sed -i "s~EE_CFLAGS += ~EE_CFLAGS += -I${srcdir}/${pkgname}/libmad/ee/include -I/..include -I/usr/${_ee}/include/${_platform}${_base}~g" "libmad/ee/src/Makefile"
-#   cat "libid3tag/ee/src/Makefile"
-#   # echo "#define  HAVE_STRCASECMP 1" >> "${srcdir}/${pkgname}/madplay/ee/src/config.h"
-#   # sed -i "/strncasecmp/d" "madplay/ee/src/global.h"
-#   cat "${srcdir}/${pkgname}/madplay/ee/src/config.h"
+    local _linker_flags=(-r)
 }
 
 build() {
-  export CFLAGS=""
-  export CXXFLAGS=""
-  export CPPFLAGS=""
-  export LDFLAGS=""
-  export IOP_CC=""
-  export EE_CC=""
-  export EE_INCS=""
-  export EE_CFLAGS=""
-  export EE_CFLAGS=""
-  export PS2SDKDATADIR=""
-
-  # cat "${srcdir}/${pkgname}/madplay/ee/src/config.h"
-  local _ee_cflags=('-include' "${srcdir}/${pkgname}/madplay/ee/src/config.h"
-                    -I"${_pe_include}"
-                    # '-include' "${srcdir}/${pkgname}/madplay/ee/src/config.h"
-                    -I"${srcdir}/${pkgname}/madplay/ee/src"
-                    # -I"${srcdir}/${pkgname}/libmad/ee/include"
-                    # '-include' "/usr/include/id3tag.h"
-                    # '-include' "/usr/${_ee}/include/sjpcm.h"
-                    # -I"../include")
-                    # -I"${srcdir}/${_pkg}"
-                    -I"${_ee_include}"
-                    -L"/usr/${_ee}/lib"
-                    -Wl,-L"/usr/${_ee}/lib"
-                    -I"${_sdk_include}"
-                    -I"${_sdk_include}/sys")
-
-  export PS2SDK="${srcdir}/${_platform}${_base}"
-  export PS2SDKDATADIR="/usr/share/ps2sdk"
-
-  # local _make_opts=(PS2SDKDATADIR="/usr/share/${_platform}${_base}")
-                    # LDFLAGS="${_ldflags[*]}"
-                    # EE_CFLAGS="${_ee_cflags[*]}")
-
   local _cmake_opts=(-Wno-dev
                      -DCMAKE_TOOLCHAIN_FILE="${srcdir}/${_platform}-ports/ps2dev.cmake"
                      -DCMAKE_INSTALL_PREFIX="/usr/ports"
                      -DBUILD_SHARED_LIBS=OFF
-                     -DLDFLAGS="-L/usr/${_ee}/include"
+                     -DLDFLAGS="-L${_ee_lib}"
                      -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON)
 
   local _site_opts=(-DUNIX:BOOL=ON)
@@ -176,71 +79,10 @@ build() {
   mkdir -p "${_build}"
   cd "${_build}"
   cmake "${_cmake_opts[@]}" "${_site_opts[@]}" "${_extra_opts[@]}" ..
-  # make -C ..
-  # ls
-  # cd "${_pkg}"
-  # cp -r "ee/include/"* "ee/src"
-  # cp -r "${srcdir}/${pkgname}/libmad/ee/include/config.h" "ee/src"
-  # cp -r "${srcdir}/${pkgname}/libmad/ee/include/bit.h" "ee/src"
-  # cp -r "${srcdir}/${pkgname}/libmad/ee/include/fixed.h" "ee/src"
-  # cp -r "${srcdir}/${pkgname}/libmad/ee/include/global.h" "ee/src"
-  # cp -r "/usr/include/id3tag.h" "ee/src"
-  # cp -r "/usr/${_ee}/startup/linkfile" "${PS2SDK}/ee/startup"
-  # PS2SDKDATADIR="/usr/share/ps2sdk" \
-  # make "${_make_opts[@]}" -C ee/src 
 }
 
 # shellcheck disable=SC2154
 package() {
-
-  export CFLAGS=""
-  export CXXFLAGS=""
-  export CPPFLAGS=""
-  export LDFLAGS=""
-
-  # export C_INCLUDE_PATH="/usr/${_ee}/include/pthread-embedded"
-  # export IOP_CFLAGS="${_cflags[*]}"
-  # export IOP_LDFLAGS="${_cflags[*]}"
-  # export EE_CFLAGS="${_cflags[*]}"
-  # export CFLAGS="${_cflags[*]}"
-  # export CPPFLAGS="${_cflags[*]}"
-  # export CXXFLAGS="${_cflags[*]}"
-  # export LDFLAGS="${_ldflags[*]}"
-  # export PS2SDK="/usr"
-  # export IOP_TOOL_PREFIX="${_iop}-elf-"
-
-  # local _make_opts=(PS2SDKDATADIR="/usr/share/${_platform}${_base}"
-  #                   DESTDIR="${pkgdir}")
-
   cd "${srcdir}/${pkgname}/build"
-  ls
-  make clean all install
-  # cd "${_pkg}"
-  # make clean
-  # LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/${_ee}/lib/pthread-embedded" \
-  # IOP_CFLAGS="${_cflags[*]}" \
-  # EE_CFLAGS="${_cflags[*]}" \
-  # CFLAGS="${_cflags[*]}" \
-  # CPPFLAGS="${_cflags[*]}" \
-  # CXXFLAGS="${_cflags[*]}" \
-  # EE_LDLAGS="${_cflags[*]}" \
-  # IOP_LDLAGS="${_cflags[*]}" \
-  # LDFLAGS="${_ldflags[*]}" \
-  # make DESTDIR="${pkgname}" "${_make_opts[@]}" -C "ee/src" install
-  # cd "${pkgdir}/usr"
-  # mv "ports" "${_ee}"
-  # cp -r "iop" "${_iop}-elf"
-  # mv "iop" "${_iop}-irx"
-  # mkdir -p "share/${_pkgname}"
-  # mv AUTHORS "share/${_pkgname}"
-  # mv samples "share/${_pkgname}"
-  # mv Defs.make "share/${_pkgname}"
-  # mv CHANGELOG "share/${_pkgname}"
-  # mv ID "share/${_pkgname}"
-  # mv README.md "share/${_pkgname}"
-  # mkdir -p "include"
-  # mv "common/include" "include/${_pkgname}"
-  # rmdir common
-  # mkdir -p "share/licenses/${_pkgname}"
-  # mv LICENSE "share/licenses/${_pkgname}"
+  make DESTDIR="${pkgdir}" clean all install
 }